From de6f2282e68df08cb3385dd78e5bed00ad180fa6 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Tue, 29 Dec 2020 19:36:58 +0200 Subject: [PATCH] remove all padding events code --in favour of EventsSink approach that will probably solve all corner cases of view sunk events --- app/view/CMakeLists.txt | 1 - app/view/padding.cpp | 105 ------------------ app/view/padding.h | 73 ------------ app/view/view.cpp | 6 - app/view/view.h | 5 - .../package/contents/ui/VisibilityManager.qml | 70 ------------ .../package/contents/ui/applet/AppletItem.qml | 28 ----- containment/package/contents/ui/main.qml | 3 - 8 files changed, 291 deletions(-) delete mode 100644 app/view/padding.cpp delete mode 100644 app/view/padding.h diff --git a/app/view/CMakeLists.txt b/app/view/CMakeLists.txt index 4fdf1c2b5..b644eac56 100644 --- a/app/view/CMakeLists.txt +++ b/app/view/CMakeLists.txt @@ -4,7 +4,6 @@ set(lattedock-app_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contextmenu.cpp ${CMAKE_CURRENT_SOURCE_DIR}/effects.cpp ${CMAKE_CURRENT_SOURCE_DIR}/eventssink.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/padding.cpp ${CMAKE_CURRENT_SOURCE_DIR}/panelshadows.cpp ${CMAKE_CURRENT_SOURCE_DIR}/parabolic.cpp ${CMAKE_CURRENT_SOURCE_DIR}/positioner.cpp diff --git a/app/view/padding.cpp b/app/view/padding.cpp deleted file mode 100644 index 24abe2bdd..000000000 --- a/app/view/padding.cpp +++ /dev/null @@ -1,105 +0,0 @@ -/* -* Copyright 2020 Michail Vourlakos -* -* This file is part of Latte-Dock -* -* Latte-Dock is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of -* the License, or (at your option) any later version. -* -* Latte-Dock is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ - -#include "padding.h" - -namespace Latte { -namespace ViewPart { - -Padding::Padding(QObject *parent) - : QObject(parent) -{ -} - -Padding::~Padding() -{ -} - -bool Padding::isEmpty() const -{ - return !((m_bottom > 0) || (m_top > 0) || (m_left > 0) || (m_right > 0)); -} - -int Padding::top() const -{ - return m_top; -} - -void Padding::setTop(int toppad) -{ - if (m_top == toppad) { - return; - } - - m_top = toppad; - emit paddingsChanged(); -} - -int Padding::bottom() const -{ - return m_bottom; -} - -void Padding::setBottom(int bottompad) -{ - if (m_bottom == bottompad) { - return; - } - - m_bottom = bottompad; - emit paddingsChanged(); -} - -int Padding::left() const -{ - return m_left; -} - -void Padding::setLeft(int leftpad) -{ - if (m_left == leftpad) { - return; - } - - m_left = leftpad; - emit paddingsChanged(); -} - -int Padding::right() const -{ - return m_right; -} - -void Padding::setRight(int rightpad) -{ - if (m_right == rightpad) { - return; - } - - m_right = rightpad; - emit paddingsChanged(); -} - -QMargins Padding::margins() const -{ - return QMargins(m_left, m_top, m_right, m_bottom); -} - -} -} diff --git a/app/view/padding.h b/app/view/padding.h deleted file mode 100644 index 73520cf95..000000000 --- a/app/view/padding.h +++ /dev/null @@ -1,73 +0,0 @@ -/* -* Copyright 2020 Michail Vourlakos -* -* This file is part of Latte-Dock -* -* Latte-Dock is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of -* the License, or (at your option) any later version. -* -* Latte-Dock is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ - -#ifndef PADDING_H -#define PADDING_H - -// Qt -#include -#include - - -namespace Latte { -namespace ViewPart { - -class Padding: public QObject -{ - Q_OBJECT - - Q_PROPERTY(int top READ top WRITE setTop NOTIFY paddingsChanged) - Q_PROPERTY(int bottom READ bottom WRITE setBottom NOTIFY paddingsChanged) - Q_PROPERTY(int left READ left WRITE setLeft NOTIFY paddingsChanged) - Q_PROPERTY(int right READ right WRITE setRight NOTIFY paddingsChanged) - -public: - Padding(QObject *parent); - virtual ~Padding(); - - bool isEmpty() const; - - int top() const; - void setTop(int toppad); - - int bottom() const; - void setBottom(int bottompad); - - int left() const; - void setLeft(int leftpad); - - int right() const; - void setRight(int rightpad); - - QMargins margins() const; - -signals: - void paddingsChanged(); - -private: - int m_left{0}; - int m_right{0}; - int m_top{0}; - int m_bottom{0}; -}; - -} -} - -#endif diff --git a/app/view/view.cpp b/app/view/view.cpp index 588dc6c44..5ca10455a 100644 --- a/app/view/view.cpp +++ b/app/view/view.cpp @@ -79,7 +79,6 @@ View::View(Plasma::Corona *corona, QScreen *targetScreen, bool byPassWM) m_contextMenu(new ViewPart::ContextMenu(this)), m_effects(new ViewPart::Effects(this)), m_interface(new ViewPart::ContainmentInterface(this)), - m_padding(new ViewPart::Padding(this)), m_parabolic(new ViewPart::Parabolic(this)), m_sink(new ViewPart::EventsSink(this)) { @@ -1292,11 +1291,6 @@ ViewPart::ContainmentInterface *View::extendedInterface() const return m_interface; } -ViewPart::Padding *View::padding() const -{ - return m_padding; -} - ViewPart::Parabolic *View::parabolic() const { return m_parabolic; diff --git a/app/view/view.h b/app/view/view.h index 770dc45ea..a5b4b7b77 100644 --- a/app/view/view.h +++ b/app/view/view.h @@ -25,7 +25,6 @@ #include #include "containmentinterface.h" #include "effects.h" -#include "padding.h" #include "parabolic.h" #include "positioner.h" #include "eventssink.h" @@ -124,7 +123,6 @@ class View : public PlasmaQuick::ContainmentView Q_PROPERTY(Latte::ViewPart::Effects *effects READ effects NOTIFY effectsChanged) Q_PROPERTY(Latte::ViewPart::ContainmentInterface *extendedInterface READ extendedInterface NOTIFY extendedInterfaceChanged) Q_PROPERTY(Latte::ViewPart::Indicator *indicator READ indicator NOTIFY indicatorChanged) - Q_PROPERTY(Latte::ViewPart::Padding *padding READ padding NOTIFY paddingChanged) Q_PROPERTY(Latte::ViewPart::Parabolic *parabolic READ parabolic NOTIFY parabolicChanged) Q_PROPERTY(Latte::ViewPart::Positioner *positioner READ positioner NOTIFY positionerChanged) Q_PROPERTY(Latte::ViewPart::EventsSink *sink READ sink NOTIFY sinkChanged) @@ -241,7 +239,6 @@ public: ViewPart::ContextMenu *contextMenu() const; ViewPart::ContainmentInterface *extendedInterface() const; ViewPart::Indicator *indicator() const; - ViewPart::Padding *padding() const; ViewPart::Parabolic *parabolic() const; ViewPart::Positioner *positioner() const; ViewPart::EventsSink *sink() const; @@ -328,7 +325,6 @@ signals: void normalHighestThicknessChanged(); void offsetChanged(); void onPrimaryChanged(); - void paddingChanged(); void parabolicChanged(); void positionerChanged(); void screenEdgeMarginChanged(); @@ -440,7 +436,6 @@ private: QPointer m_effects; QPointer m_indicator; QPointer m_interface; - QPointer m_padding; QPointer m_parabolic; QPointer m_positioner; QPointer m_sink; diff --git a/containment/package/contents/ui/VisibilityManager.qml b/containment/package/contents/ui/VisibilityManager.qml index 268af5d34..a21198265 100644 --- a/containment/package/contents/ui/VisibilityManager.qml +++ b/containment/package/contents/ui/VisibilityManager.qml @@ -222,76 +222,6 @@ Item{ value: colorizerManager } - - //! View Paddings - Binding{ - target: latteView.padding - property: "top" - when: latteView - value: { - if (!isSinkedEventEnabled) { - return 0; - } - - if (plasmoid.formFactor === PlasmaCore.Types.Vertical) { - return background.paddings.top + root.firstAppletMarginLength + 1; - } - - return metrics.margin.thickness; - } - } - - Binding{ - target: latteView.padding - property: "bottom" - when: latteView - value:{ - if (!isSinkedEventEnabled) { - return 0; - } - - if (plasmoid.formFactor === PlasmaCore.Types.Vertical) { - return background.paddings.bottom + root.lastAppletMarginLength + 1; - } - - return metrics.margin.thickness; - } - } - - Binding{ - target: latteView.padding - property: "left" - when: latteView - value: { - if (!isSinkedEventEnabled) { - return 0; - } - - if (plasmoid.formFactor === PlasmaCore.Types.Horizontal) { - return background.paddings.left + root.firstAppletMarginLength + 1; - } - - return metrics.margin.thickness; - } - } - - Binding{ - target: latteView.padding - property: "right" - when: latteView - value: { - if (!isSinkedEventEnabled) { - return 0; - } - - if (plasmoid.formFactor === PlasmaCore.Types.Horizontal) { - return background.paddings.right + root.lastAppletMarginLength + 1; - } - - return metrics.margin.thickness; - } - } - //! View::Effects bindings Binding{ target: latteView && latteView.effects ? latteView.effects : null diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml index 920350e48..248959ca5 100644 --- a/containment/package/contents/ui/applet/AppletItem.qml +++ b/containment/package/contents/ui/applet/AppletItem.qml @@ -621,34 +621,6 @@ Item { value: lengthAppletPadding + metrics.margin.length; } - Binding { - target: root - property: "firstAppletMarginLength" - when: (root.panelAlignment === LatteCore.Types.Justify && appletItem.firstChildOfStartLayout) - || (root.panelAlignment !== LatteCore.Types.Justify && appletItem.firstChildOfMainLayout) - value: { - if (appletItem.communicator.indexerIsSupported) { - return 0; - } - - return appletItem.lengthAppletFullMargin; - } - } - - Binding { - target: root - property: "lastAppletMarginLength" - when: (root.panelAlignment === LatteCore.Types.Justify && appletItem.lastChildOfEndLayout) - || (root.panelAlignment !== LatteCore.Types.Justify && appletItem.lastChildOfMainLayout) - value: { - if (appletItem.communicator.indexerIsSupported) { - return 0; - } - - return appletItem.lengthAppletFullMargin; - } - } - //! Connections Connections{ target: appletItem.shortcuts diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml index a19f7ed60..9dffad3c2 100644 --- a/containment/package/contents/ui/main.qml +++ b/containment/package/contents/ui/main.qml @@ -351,9 +351,6 @@ Item { property int widthMargins: root.isVertical ? metrics.totals.thicknessEdges : metrics.totals.lengthEdges property int heightMargins: root.isHorizontal ? metrics.totals.thicknessEdges : metrics.totals.lengthEdges - property int firstAppletMarginLength: 0 /*is set by applets*/ - property int lastAppletMarginLength: 0 /*is set by applets*/ - property int panelAlignment: plasmoid.configuration.alignment readonly property string plasmoidName: "org.kde.latte.plasmoid"