From 3a0a95e6a9cefb1d39c2ba4baa43b6199767a99a Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sat, 1 Dec 2018 00:26:56 +0200 Subject: [PATCH] refactor: rename properties in View::Effects --effectsArea became "rect" --maskArea became "mask" --- app/dock/dockview.cpp | 4 +- app/dock/effects.cpp | 45 ++++++++--------- app/dock/effects.h | 20 ++++---- .../package/contents/ui/DebugWindow.qml | 8 ++-- .../package/contents/ui/EditModeVisual.qml | 4 +- containment/package/contents/ui/PanelBox.qml | 2 +- .../package/contents/ui/VisibilityManager.qml | 48 +++++++++---------- 7 files changed, 64 insertions(+), 67 deletions(-) diff --git a/app/dock/dockview.cpp b/app/dock/dockview.cpp index 1cb76829c..83f9d1929 100644 --- a/app/dock/dockview.cpp +++ b/app/dock/dockview.cpp @@ -488,9 +488,9 @@ bool DockView::contextMenuIsShown() const int DockView::currentThickness() const { if (formFactor() == Plasma::Types::Vertical) { - return m_effects->maskArea().isNull() ? width() : m_effects->maskArea().width() - m_shadow; + return m_effects->mask().isNull() ? width() : m_effects->mask().width() - m_shadow; } else { - return m_effects->maskArea().isNull() ? height() : m_effects->maskArea().height() - m_shadow; + return m_effects->mask().isNull() ? height() : m_effects->mask().height() - m_shadow; } } diff --git a/app/dock/effects.cpp b/app/dock/effects.cpp index c0df0f62b..b63e23065 100644 --- a/app/dock/effects.cpp +++ b/app/dock/effects.cpp @@ -44,7 +44,7 @@ Effects::~Effects() void Effects::init() { connect(this, &Effects::drawEffectsChanged, this, &Effects::updateEffects); - connect(this, &Effects::effectsAreaChanged, this, &Effects::updateEffects); + connect(this, &Effects::rectChanged, this, &Effects::updateEffects); connect(this, &Effects::drawShadowsChanged, this, [&]() { if (m_view->behaveAsPlasmaPanel()) { @@ -109,40 +109,40 @@ void Effects::setForceDrawCenteredBorders(bool draw) m_forceDrawCenteredBorders = draw; } -QRect Effects::effectsArea() const +QRect Effects::rect() const { - return m_effectsArea; + return m_rect; } -void Effects::setEffectsArea(QRect area) +void Effects::setRect(QRect area) { QRect inWindowRect = area.intersected(QRect(0, 0, m_view->width(), m_view->height())); - if (m_effectsArea == inWindowRect) { + if (m_rect == inWindowRect) { return; } - m_effectsArea = inWindowRect; - emit effectsAreaChanged(); + m_rect = inWindowRect; + emit rectChanged(); } -QRect Effects::maskArea() const +QRect Effects::mask() const { - return m_maskArea; + return m_mask; } -void Effects::setMaskArea(QRect area) +void Effects::setMask(QRect area) { - if (m_maskArea == area) + if (m_mask == area) return; - m_maskArea = area; + m_mask = area; if (KWindowSystem::compositingActive()) { if (m_view->behaveAsPlasmaPanel()) { m_view->setMask(QRect()); } else { - m_view->setMask(m_maskArea); + m_view->setMask(m_mask); } } else { //! this is used when compositing is disabled and provides @@ -161,23 +161,20 @@ void Effects::setMaskArea(QRect area) m_background->setEnabledBorders(m_enabledBorders); m_background->resizeFrame(area.size()); QRegion fixedMask = m_background->mask(); - fixedMask.translate(m_maskArea.x(), m_maskArea.y()); + fixedMask.translate(m_mask.x(), m_mask.y()); //! fix for KF5.32 that return empty QRegion's for the mask if (fixedMask.isEmpty()) { - fixedMask = QRegion(m_maskArea); + fixedMask = QRegion(m_mask); } m_view->setMask(fixedMask); } - // qDebug() << "dock mask set:" << m_maskArea; - emit maskAreaChanged(); + // qDebug() << "dock mask set:" << m_mask; + emit maskChanged(); } - - - void Effects::updateEffects() { //! Don't apply any effect before the wayland surface is created under wayland @@ -187,7 +184,7 @@ void Effects::updateEffects() } if (!m_view->behaveAsPlasmaPanel()) { - if (m_drawEffects && !m_effectsArea.isNull() && !m_effectsArea.isEmpty()) { + if (m_drawEffects && !m_rect.isNull() && !m_rect.isEmpty()) { //! this is used when compositing is disabled and provides //! the correct way for the mask to be painted in order for //! rounded corners to be shown correctly @@ -200,13 +197,13 @@ void Effects::updateEffects() } m_background->setEnabledBorders(m_enabledBorders); - m_background->resizeFrame(m_effectsArea.size()); + m_background->resizeFrame(m_rect.size()); QRegion fixedMask = m_background->mask(); - fixedMask.translate(m_effectsArea.x(), m_effectsArea.y()); + fixedMask.translate(m_rect.x(), m_rect.y()); //! fix1, for KF5.32 that return empty QRegion's for the mask if (fixedMask.isEmpty()) { - fixedMask = QRegion(m_effectsArea); + fixedMask = QRegion(m_rect); } KWindowEffects::enableBlurBehind(m_view->winId(), true, fixedMask); diff --git a/app/dock/effects.h b/app/dock/effects.h index f28757dcc..8c95c2a03 100644 --- a/app/dock/effects.h +++ b/app/dock/effects.h @@ -40,8 +40,8 @@ class Effects: public QObject Q_PROPERTY(bool drawShadows READ drawShadows WRITE setDrawShadows NOTIFY drawShadowsChanged) Q_PROPERTY(bool drawEffects READ drawEffects WRITE setDrawEffects NOTIFY drawEffectsChanged) - Q_PROPERTY(QRect effectsArea READ effectsArea WRITE setEffectsArea NOTIFY effectsAreaChanged) - Q_PROPERTY(QRect maskArea READ maskArea WRITE setMaskArea NOTIFY maskAreaChanged) + Q_PROPERTY(QRect mask READ mask WRITE setMask NOTIFY maskChanged) + Q_PROPERTY(QRect rect READ rect WRITE setRect NOTIFY rectChanged) Q_PROPERTY(Plasma::FrameSvg::EnabledBorders enabledBorders READ enabledBorders NOTIFY enabledBordersChanged) @@ -58,11 +58,11 @@ public: bool forceDrawCenteredBorders() const; void setForceDrawCenteredBorders(bool draw); - QRect maskArea() const; - void setMaskArea(QRect area); + QRect mask() const; + void setMask(QRect area); - QRect effectsArea() const; - void setEffectsArea(QRect area); + QRect rect() const; + void setRect(QRect area); Plasma::FrameSvg::EnabledBorders enabledBorders() const; @@ -73,9 +73,9 @@ public slots: signals: void drawShadowsChanged(); void drawEffectsChanged(); - void effectsAreaChanged(); void enabledBordersChanged(); - void maskAreaChanged(); + void maskChanged(); + void rectChanged(); private slots: void init(); @@ -85,8 +85,8 @@ private: bool m_drawEffects{false}; bool m_forceDrawCenteredBorders{false}; - QRect m_effectsArea; - QRect m_maskArea; + QRect m_rect; + QRect m_mask; QPointer m_view; diff --git a/containment/package/contents/ui/DebugWindow.qml b/containment/package/contents/ui/DebugWindow.qml index df82814f3..9ac061f3e 100644 --- a/containment/package/contents/ui/DebugWindow.qml +++ b/containment/package/contents/ui/DebugWindow.qml @@ -149,8 +149,8 @@ Window{ Text{ text: { - if (dock && dock.effects && dock.effects.maskArea) { - return dock.effects.maskArea.x +", "+ dock.effects.maskArea.y+" "+dock.effects.maskArea.width+"x"+dock.effects.maskArea.height; + if (dock && dock.effects && dock.effects.mask) { + return dock.effects.mask.x +", "+ dock.effects.mask.y+" "+dock.effects.mask.width+"x"+dock.effects.mask.height; } else { return "_,_ _x_"; } @@ -204,8 +204,8 @@ Window{ Text{ text: { - if (dock && dock.effects && dock.effects.effectsArea) { - return dock.effects.effectsArea.x + ", " + dock.effects.effectsArea.y + " " +dock.effects.effectsArea.width + "x" + dock.effects.effectsArea.height; + if (dock && dock.effects && dock.effects.rect) { + return dock.effects.rect.x + ", " + dock.effects.rect.y + " " +dock.effects.rect.width + "x" + dock.effects.rect.height; } else { return "_,_ _x_"; } diff --git a/containment/package/contents/ui/EditModeVisual.qml b/containment/package/contents/ui/EditModeVisual.qml index cb3f2d17c..8d64b4e0d 100644 --- a/containment/package/contents/ui/EditModeVisual.qml +++ b/containment/package/contents/ui/EditModeVisual.qml @@ -219,7 +219,7 @@ Item{ efGeometry.width = width; efGeometry.height = height; - dock.effects.effectsArea = efGeometry; + dock.effects.rect = efGeometry; } @@ -329,7 +329,7 @@ Item{ ScriptAction{ script: { //! remove kwin effects when starting the animation - dock.effects.effectsArea = Qt.rect(-1, -1, 0, 0); + dock.effects.rect = Qt.rect(-1, -1, 0, 0); } } diff --git a/containment/package/contents/ui/PanelBox.qml b/containment/package/contents/ui/PanelBox.qml index 2c3e5e097..3b91bba88 100644 --- a/containment/package/contents/ui/PanelBox.qml +++ b/containment/package/contents/ui/PanelBox.qml @@ -370,7 +370,7 @@ Item{ efGeometry.width = width; efGeometry.height = height; - dock.effects.effectsArea = efGeometry; + dock.effects.rect = efGeometry; if (!Latte.WindowSystem.compositingActive) { visibilityManager.updateMaskArea(); diff --git a/containment/package/contents/ui/VisibilityManager.qml b/containment/package/contents/ui/VisibilityManager.qml index 6031a8007..cf386e459 100644 --- a/containment/package/contents/ui/VisibilityManager.qml +++ b/containment/package/contents/ui/VisibilityManager.qml @@ -395,7 +395,7 @@ Item{ } } // end of compositing calculations - var maskArea = dock.effects.maskArea; + var maskArea = dock.effects.mask; if (Latte.WindowSystem.compositingActive) { var maskLength = maskArea.width; //in Horizontal @@ -410,30 +410,30 @@ Item{ } else { //! no compositing case if (!dock.visibility.isHidden || !dock.visibility.supportsKWinEdges) { - localX = dock.effects.effectsArea.x; - localY = dock.effects.effectsArea.y; + localX = dock.effects.rect.x; + localY = dock.effects.rect.y; } else { if (plasmoid.location === PlasmaCore.Types.BottomEdge) { - localX = dock.effects.effectsArea.x; - localY = dock.effects.effectsArea.y+dock.effects.effectsArea.height+thicknessAutoHidden; + localX = dock.effects.rect.x; + localY = dock.effects.rect.y+dock.effects.rect.height+thicknessAutoHidden; } else if (plasmoid.location === PlasmaCore.Types.TopEdge) { - localX = dock.effects.effectsArea.x; - localY = dock.effects.effectsArea.y - thicknessAutoHidden; + localX = dock.effects.rect.x; + localY = dock.effects.rect.y - thicknessAutoHidden; } else if (plasmoid.location === PlasmaCore.Types.LeftEdge) { - localX = dock.effects.effectsArea.x - thicknessAutoHidden; - localY = dock.effects.effectsArea.y; + localX = dock.effects.rect.x - thicknessAutoHidden; + localY = dock.effects.rect.y; } else if (plasmoid.location === PlasmaCore.Types.RightEdge) { - localX = dock.effects.effectsArea.x + dock.effects.effectsArea.width + 1; - localY = dock.effects.effectsArea.y; + localX = dock.effects.rect.x + dock.effects.rect.width + 1; + localY = dock.effects.rect.y; } } if (root.isHorizontal) { - tempThickness = dock.effects.effectsArea.height; - tempLength = dock.effects.effectsArea.width; + tempThickness = dock.effects.rect.height; + tempLength = dock.effects.rect.width; } else { - tempThickness = dock.effects.effectsArea.width; - tempLength = dock.effects.effectsArea.height; + tempThickness = dock.effects.rect.width; + tempLength = dock.effects.rect.height; } } @@ -455,12 +455,12 @@ Item{ } if (!Latte.WindowSystem.compositingActive) { - dock.effects.maskArea = newMaskArea;//dock.effectsArea; + dock.effects.mask = newMaskArea; } else { if (dock.behaveAsPlasmaPanel && !root.editMode) { - dock.effects.maskArea = Qt.rect(0,0,root.width,root.height); + dock.effects.mask = Qt.rect(0,0,root.width,root.height); } else { - dock.effects.maskArea = newMaskArea; + dock.effects.mask = newMaskArea; } } } @@ -468,7 +468,7 @@ Item{ //console.log("reached updating geometry ::: "+dock.maskArea); if(normalState){ - var tempGeometry = Qt.rect(dock.effects.maskArea.x, dock.effects.maskArea.y, dock.effects.maskArea.width, dock.effects.maskArea.height); + var tempGeometry = Qt.rect(dock.effects.mask.x, dock.effects.mask.y, dock.effects.mask.width, dock.effects.mask.height); //the shadows size must be removed from the maskArea //before updating the localDockGeometry @@ -498,7 +498,7 @@ Item{ //console.log("update geometry ::: "+tempGeometry); if (!Latte.WindowSystem.compositingActive) { - dock.localGeometry = dock.effects.effectsArea; + dock.localGeometry = dock.effects.rect; } else { dock.localGeometry = tempGeometry; } @@ -522,10 +522,10 @@ Item{ } Rectangle{ - x: dock ? dock.effects.maskArea.x : -1 - y: dock ? dock.effects.maskArea.y : -1 - height: dock ? dock.effects.maskArea.height : 0 - width: dock ? dock.effects.maskArea.width : 0 + x: dock ? dock.effects.mask.x : -1 + y: dock ? dock.effects.mask.y : -1 + height: dock ? dock.effects.mask.height : 0 + width: dock ? dock.effects.mask.width : 0 border.color: "green" border.width: 1