From f701864a696129ecd96561298042cc2c7766675a Mon Sep 17 00:00:00 2001 From: audoban Date: Fri, 30 Dec 2016 16:32:48 -0500 Subject: [PATCH] code formatted --- app/dockconfigview.cpp | 10 +++---- app/dockcorona.cpp | 20 +++++++------- app/dockcorona.h | 2 +- app/dockview.cpp | 6 ++-- app/iconitem.cpp | 12 ++++---- app/iconitem.h | 5 ++-- app/visibilitymanager.cpp | 55 ++++++++++++++++++++++--------------- app/visibilitymanager.h | 2 +- app/xwindowinterface.cpp | 8 +++--- liblattedock/windowsystem.h | 2 +- 10 files changed, 66 insertions(+), 56 deletions(-) diff --git a/app/dockconfigview.cpp b/app/dockconfigview.cpp index e67c33b27..6dfd13a28 100644 --- a/app/dockconfigview.cpp +++ b/app/dockconfigview.cpp @@ -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(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 diff --git a/app/dockcorona.cpp b/app/dockcorona.cpp index 689521b1f..04b5691f9 100644 --- a/app/dockcorona.cpp +++ b/app/dockcorona.cpp @@ -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 DockCorona::freeEdges(int screen) const using Plasma::Types; QList 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 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(); diff --git a/app/dockcorona.h b/app/dockcorona.h index 7a21a02d6..8c4f6b47e 100644 --- a/app/dockcorona.h +++ b/app/dockcorona.h @@ -33,7 +33,7 @@ public: public slots: void loadDefaultLayout() override; - + signals: void configurationShown(PlasmaQuick::ConfigView *configView); diff --git a/app/dockview.cpp b/app/dockview.cpp index 8d4fa2b9e..a8dfe123c 100644 --- a/app/dockview.cpp +++ b/app/dockview.cpp @@ -501,13 +501,13 @@ QPointF DockView::positionAdjustedForContainment(const QPointF &point) const QList DockView::freeEdges() const { QList edges = m_corona->freeEdges(containment()->screen()); - + QList edgesInt; - + foreach (Plasma::Types::Location edge, edges) { edgesInt.append((int)edge); } - + return edgesInt; } diff --git a/app/iconitem.cpp b/app/iconitem.cpp index b155ebb69..772438f6c 100644 --- a/app/iconitem.cpp +++ b/app/iconitem.cpp @@ -114,7 +114,7 @@ void IconItem::setSource(const QVariant &source) iconPath = iconTheme->iconPath(sourceString + QLatin1String(".svg") , static_cast(qMin(width(), height())) , KIconLoader::MatchBest); - + if (iconPath.isEmpty()) { iconPath = iconTheme->iconPath(sourceString + QLatin1String(".svgz") , static_cast(qMin(width(), height())) @@ -257,9 +257,9 @@ QSGNode *IconItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *update ManagedTextureNode *textureNode = dynamic_cast(oldNode); if (!textureNode || m_textureChanged) { - if (oldNode) + if (oldNode) delete oldNode; - + textureNode = new ManagedTextureNode; textureNode->setTexture(QSharedPointer(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(qMin(width(), height())) , KIconLoader::MatchBest); - + if (iconPath.isEmpty()) { - iconPath = iconTheme->iconPath(m_svgIconName + QLatin1String(".svgz"), + iconPath = iconTheme->iconPath(m_svgIconName + QLatin1String(".svgz"), static_cast(qMin(width(), height())) , KIconLoader::MatchBest); } diff --git a/app/iconitem.h b/app/iconitem.h index d242fca10..8479d1fa7 100644 --- a/app/iconitem.h +++ b/app/iconitem.h @@ -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 diff --git a/app/visibilitymanager.cpp b/app/visibilitymanager.cpp index e8ba13142..76d95ffb3 100644 --- a/app/visibilitymanager.cpp +++ b/app/visibilitymanager.cpp @@ -13,11 +13,11 @@ VisibilityManagerPrivate::VisibilityManagerPrivate(PlasmaQuick::ContainmentView : QObject(q), q(q), view(view), wm(AbstractWindowInterface::getInstance(view, nullptr)) { DockView *dockView = qobject_cast(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 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(mode)); @@ -254,7 +254,7 @@ inline void VisibilityManagerPrivate::restoreConfig() { if (!view->containment()) return; - + auto config = view->containment()->config(); mode = static_cast(config.readEntry("visibility", static_cast(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); + + <<< <<< >>>>>> code formatted } else if (ev->type() == QEvent::Show) { wm->setDockDefaultFlags(); } @@ -350,4 +362,3 @@ void VisibilityManager::updateDockGeometry(const QRect &geometry) //! END: VisibilityManager implementation } - diff --git a/app/visibilitymanager.h b/app/visibilitymanager.h index a70180062..1dc9f8357 100644 --- a/app/visibilitymanager.h +++ b/app/visibilitymanager.h @@ -44,7 +44,7 @@ public: * @brief updateDockGeometry, the window geometry in absolute coordinates. */ void updateDockGeometry(const QRect &geometry); - + signals: void mustBeShown(); void mustBeHide(); diff --git a/app/xwindowinterface.cpp b/app/xwindowinterface.cpp index a1f3f8a4f..0cd8d7b02 100644 --- a/app/xwindowinterface.cpp +++ b/app/xwindowinterface.cpp @@ -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(m_view->winId()) , static_cast(m_view->winId()) diff --git a/liblattedock/windowsystem.h b/liblattedock/windowsystem.h index 4037eb783..4bbba75f2 100644 --- a/liblattedock/windowsystem.h +++ b/liblattedock/windowsystem.h @@ -23,7 +23,7 @@ signals: private slots: void compositingChangedProxy(bool enabled); - + private: bool m_enabled{false}; };