github-forks
/
latte-dock
mirror of https://github.com/KDE/latte-dock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

code formatted

Browse Source
v0.6
audoban 8 years ago committed by Michail Vourlakos
parent 170a2eec15
commit f701864a69
10 changed files with 66 additions and 56 deletions
Show Stats Download Patch File Download Diff File

10
app/dockconfigview.cpp
Unescape Escape View File

@ -55,14 +55,14 @@ DockConfigView::DockConfigView(Plasma::Containment *containment, DockView *dockV
});
connect(containment, &Plasma::Containment::immutabilityChanged, this, &DockConfigView::immutabilityChanged);
//! NOTE: This is not necesesary if focusOutEvent is implemented
/*NowDockCorona *corona = qobject_cast<NowDockCorona *>(m_containment->corona());
if (corona) {
connect(corona, &NowDockCorona::configurationShown, this, &DockConfigView::configurationShown);
}*/
/* connect(containment, &Plasma::Containment::immutabilityChanged
, [&](Plasma::Types::ImmutabilityType type) {
if (type != Plasma::Types::Mutable && this && isVisible())
@ -186,9 +186,9 @@ void DockConfigView::showEvent(QShowEvent *ev)
m_screenSyncTimer.start();
m_deleterTimer.stop();
ConfigView::showEvent(ev);
//trigger showing configuration window through corona
//in order to hide all alternative configuration windows
//! NOTE: This is not necesesary if focusOutEvent is implemented

20
app/dockcorona.cpp
Unescape Escape View File

@ -122,18 +122,18 @@ QRect DockCorona::availableScreenRect(int id) const
int DockCorona::primaryScreenId() const
{
const auto screens = qGuiApp->screens();
int id = -1;
for (int i = 0; i < screens.size(); ++i) {
auto *scr = screens.at(i);
if (scr == qGuiApp->primaryScreen()) {
id = i;
break;
}
}
return id;
}
@ -142,10 +142,10 @@ QList<Plasma::Types::Location> DockCorona::freeEdges(int screen) const
using Plasma::Types;
QList<Types::Location> edges{Types::BottomEdge, Types::LeftEdge,
Types::TopEdge, Types::RightEdge};
//when screen=-1 is passed then the primaryScreenid is used
int fixedScreen = (screen == -1) ? primaryScreenId() : screen;
for (const DockView *cont : m_containments) {
if (cont && cont->containment()->screen() == fixedScreen)
edges.removeOne(cont->location());
@ -175,7 +175,7 @@ void DockCorona::addDock(Plasma::Containment *containment)
// the system tray is a containment that behaves as an applet
// so a dockview shouldnt be created for it
KPluginMetaData metadata = containment->kPackage().metadata();
if (metadata.pluginId() == "org.kde.plasma.private.systemtray") {
return;
}
@ -216,15 +216,15 @@ void DockCorona::loadDefaultLayout()
auto config = defaultContainment->config();
defaultContainment->restore(config);
QList<Plasma::Types::Location> edges = freeEdges(defaultContainment->screen());
if (edges.count() > 0) {
defaultContainment->setLocation(edges.at(0));
} else {
defaultContainment->setLocation(Plasma::Types::BottomEdge);
}
defaultContainment->updateConstraints(Plasma::Types::StartupCompletedConstraint);
defaultContainment->save(config);
requestConfigSync();

2
app/dockcorona.h
Unescape Escape View File

@ -33,7 +33,7 @@ public:
public slots:
void loadDefaultLayout() override;
signals:
void configurationShown(PlasmaQuick::ConfigView *configView);

6
app/dockview.cpp
Unescape Escape View File

@ -501,13 +501,13 @@ QPointF DockView::positionAdjustedForContainment(const QPointF &point) const
QList<int> DockView::freeEdges() const
{
QList<Plasma::Types::Location> edges = m_corona->freeEdges(containment()->screen());
QList<int> edgesInt;
foreach (Plasma::Types::Location edge, edges) {
edgesInt.append((int)edge);
}
return edgesInt;
}

12
app/iconitem.cpp
Unescape Escape View File

@ -114,7 +114,7 @@ void IconItem::setSource(const QVariant &source)
iconPath = iconTheme->iconPath(sourceString + QLatin1String(".svg")
, static_cast<int>(qMin(width(), height()))
, KIconLoader::MatchBest);
if (iconPath.isEmpty()) {
iconPath = iconTheme->iconPath(sourceString + QLatin1String(".svgz")
, static_cast<int>(qMin(width(), height()))
@ -257,9 +257,9 @@ QSGNode *IconItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *update
ManagedTextureNode *textureNode = dynamic_cast<ManagedTextureNode *>(oldNode);
if (!textureNode || m_textureChanged) {
if (oldNode)
if (oldNode)
delete oldNode;
textureNode = new ManagedTextureNode;
textureNode->setTexture(QSharedPointer<QSGTexture>(window()->createTextureFromImage(m_iconPixmap.toImage())));
m_sizeChanged = true;
@ -269,7 +269,7 @@ QSGNode *IconItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *update
if (m_sizeChanged) {
const auto iconSize = qMin(boundingRect().size().width(), boundingRect().size().height());
const QRectF destRect(QPointF(boundingRect().center() - QPointF(iconSize / 2, iconSize / 2)), QSizeF(iconSize, iconSize));
textureNode->setRect(destRect);
m_sizeChanged = false;
}
@ -315,9 +315,9 @@ void IconItem::loadPixmap()
iconPath = iconTheme->iconPath(m_svgIconName + QLatin1String(".svg")
, static_cast<int>(qMin(width(), height()))
, KIconLoader::MatchBest);
if (iconPath.isEmpty()) {
iconPath = iconTheme->iconPath(m_svgIconName + QLatin1String(".svgz"),
iconPath = iconTheme->iconPath(m_svgIconName + QLatin1String(".svgz"),
static_cast<int>(qMin(width(), height()))
, KIconLoader::MatchBest);
}

5
app/iconitem.h
Unescape Escape View File

@ -107,7 +107,7 @@ public:
void itemChange(ItemChange change, const ItemChangeData &value) override;
void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
void componentComplete() Q_DECL_OVERRIDE;
signals:
@ -141,8 +141,7 @@ private:
bool m_textureChanged;
bool m_sizeChanged;
};
}
#endif // ICONITEM_H

55
app/visibilitymanager.cpp
Unescape Escape View File

@ -13,11 +13,11 @@ VisibilityManagerPrivate::VisibilityManagerPrivate(PlasmaQuick::ContainmentView
: QObject(q), q(q), view(view), wm(AbstractWindowInterface::getInstance(view, nullptr))
{
DockView *dockView = qobject_cast<DockView *>(view);
if (dockView) {
connect(dockView, &DockView::eventTriggered, this, &VisibilityManagerPrivate::event);
}
timerCheckWindows.setInterval(350);
timerCheckWindows.setSingleShot(true);
@ -42,11 +42,11 @@ inline void VisibilityManagerPrivate::setMode(Dock::Visibility mode)
{
if (this->mode == mode)
return;
// clear mode
if (this->mode == Dock::AlwaysVisible)
wm->removeDockStruts();
for (auto &c : connections) {
disconnect(c);
}
@ -68,31 +68,31 @@ inline void VisibilityManagerPrivate::setMode(Dock::Visibility mode)
raiseDock(!containsMouse);
}
break;
case Dock::DodgeActive: {
connections[0] = connect(wm.get(), &AbstractWindowInterface::activeWindowChanged
, this, &VisibilityManagerPrivate::dodgeActive);
connections[1] = connect(wm.get(), &AbstractWindowInterface::windowChanged
, this, &VisibilityManagerPrivate::dodgeActive);
dodgeActive(wm->activeWindow());
}
break;
case Dock::DodgeMaximized: {
connections[0] = connect(wm.get(), &AbstractWindowInterface::windowChanged
, this, &VisibilityManagerPrivate::dodgeMaximized);
}
break;
case Dock::DodgeAllWindows: {
for (const auto &wid : wm->windows()) {
windows.insert({wid, wm->requestInfo(wid)});
}
connections[0] = connect(wm.get(), &AbstractWindowInterface::windowChanged
, this, &VisibilityManagerPrivate::dodgeWindows);
connections[1] = connect(wm.get(), &AbstractWindowInterface::windowRemoved
, this, [&](WId wid) {
windows.erase(wid);
@ -107,7 +107,7 @@ inline void VisibilityManagerPrivate::setMode(Dock::Visibility mode)
}
saveConfig();
emit q->modeChanged();
}
@ -115,7 +115,7 @@ inline void VisibilityManagerPrivate::setIsHidden(bool isHidden)
{
if (this->isHidden == isHidden)
return;
this->isHidden = isHidden;
emit q->isHiddenChanged();
}
@ -140,7 +140,7 @@ inline void VisibilityManagerPrivate::raiseDock(bool raise)
/* if (!isHidden == raise) {
return;
} */
if (raise) {
timerHide.stop();
@ -149,7 +149,7 @@ inline void VisibilityManagerPrivate::raiseDock(bool raise)
}
} else {
timerShow.stop();
if (!timerHide.isActive() && view->containment()->immutability() != Plasma::Types::Mutable)
timerHide.start();
}
@ -159,7 +159,7 @@ inline void VisibilityManagerPrivate::setDockRect(const QRect &dockRect)
{
if (!view->containment() || this->dockRect == dockRect)
return;
this->dockRect = dockRect;
if (mode == Dock::AlwaysVisible) {
@ -171,7 +171,7 @@ void VisibilityManagerPrivate::dodgeActive(WId wid)
{
if (wid != wm->activeWindow())
return;
auto winfo = wm->requestInfo(wid);
if (!winfo.isValid() || !winfo.isOnCurrentDesktop() || winfo.isMinimized())
@ -184,7 +184,7 @@ void VisibilityManagerPrivate::dodgeMaximized(WId wid)
{
if (wid != wm->activeWindow())
return;
auto winfo = wm->requestInfo(wid);
if (!winfo.isValid() || !winfo.isOnCurrentDesktop() || winfo.isMinimized())
@ -199,7 +199,7 @@ void VisibilityManagerPrivate::dodgeWindows(WId wid)
if (!winfo.isValid() || !winfo.isOnCurrentDesktop() || winfo.isMinimized())
return;
if (intersects(winfo))
raiseDock(false);
else
@ -214,7 +214,7 @@ void VisibilityManagerPrivate::checkAllWindows()
//! std::pair<WId, WindowInfoWrap>
if (!std::get<1>(winfo).isValid() || !std::get<1>(winfo).isOnCurrentDesktop())
continue;
if (std::get<1>(winfo).isFullscreen()) {
raise = false;
break;
@ -240,7 +240,7 @@ inline void VisibilityManagerPrivate::saveConfig()
{
if (!view->containment())
return;
auto config = view->containment()->config();
config.writeEntry("visibility", static_cast<int>(mode));
@ -254,7 +254,7 @@ inline void VisibilityManagerPrivate::restoreConfig()
{
if (!view->containment())
return;
auto config = view->containment()->config();
mode = static_cast<Dock::Visibility>(config.readEntry("visibility", static_cast<int>(Dock::DodgeActive)));
@ -271,13 +271,25 @@ bool VisibilityManagerPrivate::event(QEvent *ev)
containsMouse = true;
emit q->containsMouseChanged();
<<< <<< < HEAD
raiseDock(true);
== == == =
if (mode == Dock::AutoHide)
raiseDock(true);
>>> >>> > code formatted
} else if (ev->type() == QEvent::Leave && containsMouse) {
containsMouse = false;
emit q->containsMouseChanged();
if (mode == Dock::AutoHide)
raiseDock(false);
<<< <<< <HEAD
== == == =
>>>>>>> code formatted
} else if (ev->type() == QEvent::Show) {
wm->setDockDefaultFlags();
}
@ -350,4 +362,3 @@ void VisibilityManager::updateDockGeometry(const QRect &geometry)
//! END: VisibilityManager implementation
}

2
app/visibilitymanager.h
Unescape Escape View File

@ -44,7 +44,7 @@ public:
* @brief updateDockGeometry, the window geometry in absolute coordinates.
*/
void updateDockGeometry(const QRect &geometry);
signals:
void mustBeShown();
void mustBeHide();

8
app/xwindowinterface.cpp
Unescape Escape View File

@ -48,10 +48,10 @@ XWindowInterface::~XWindowInterface()
void XWindowInterface::setDockDefaultFlags()
{
m_view->setFlags(Qt::FramelessWindowHint
| Qt::WindowStaysOnTopHint
| Qt::NoDropShadowWindowHint
| Qt::WindowDoesNotAcceptFocus);
| Qt::WindowStaysOnTopHint
| Qt::NoDropShadowWindowHint
| Qt::WindowDoesNotAcceptFocus);
NETWinInfo winfo(QX11Info::connection()
, static_cast<xcb_window_t>(m_view->winId())
, static_cast<xcb_window_t>(m_view->winId())

2
liblattedock/windowsystem.h
Unescape Escape View File

@ -23,7 +23,7 @@ signals:
private slots:
void compositingChangedProxy(bool enabled);
private:
bool m_enabled{false};
};

Write Preview
Loading…
Cancel
Save