From 6e3c35510b890074c75b94c385614a31a4f283d9 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Thu, 21 Jan 2021 00:25:54 +0200
Subject: [PATCH] move updateMaskArea() calls into VisibilityManager
---
.../package/contents/ui/VisibilityManager.qml | 12 ++++++++++++
.../contents/ui/background/MultiLayered.qml | 4 ----
containment/package/contents/ui/main.qml | 15 ---------------
3 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/containment/package/contents/ui/VisibilityManager.qml b/containment/package/contents/ui/VisibilityManager.qml
index 88de1e512..8da3de17f 100644
--- a/containment/package/contents/ui/VisibilityManager.qml
+++ b/containment/package/contents/ui/VisibilityManager.qml
@@ -419,11 +419,23 @@ Item{
}
}
+ Connections {
+ target: latteView ? latteView.effects : null
+ onRectChanged: manager.updateMaskArea()
+ }
+
Connections{
target: themeExtended ? themeExtended : null
onThemeChanged: latteView.effects.forceMaskRedraw();
}
+ Connections {
+ target: LatteCore.WindowSystem
+ onCompositingActiveChanged: {
+ manager.updateMaskArea();
+ }
+ }
+
onIsFloatingInClientSideChanged: updateMaskArea();
onInNormalStateChanged: {
diff --git a/containment/package/contents/ui/background/MultiLayered.qml b/containment/package/contents/ui/background/MultiLayered.qml
index e9a46c996..1b55836ca 100644
--- a/containment/package/contents/ui/background/MultiLayered.qml
+++ b/containment/package/contents/ui/background/MultiLayered.qml
@@ -426,10 +426,6 @@ BackgroundProperties{
}
latteView.effects.rect = efGeometry;
-
- //! needed both for NOCOMPOSITING environments AND
- //! View::localGeometry calculations
- visibilityManager.updateMaskArea();
}
Timer {
diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml
index 2d265a563..0a54c4904 100644
--- a/containment/package/contents/ui/main.qml
+++ b/containment/package/contents/ui/main.qml
@@ -684,8 +684,6 @@ Item {
Plasmoid.onImmutableChanged: {
plasmoid.action("configure").visible = !plasmoid.immutable;
plasmoid.action("configure").enabled = !plasmoid.immutable;
-
- visibilityManager.updateMaskArea();
}
//////////////END OF CONNECTIONS
@@ -1023,19 +1021,6 @@ Item {
}
//END functions
-
- ////BEGIN interfaces
-
- Connections {
- target: LatteCore.WindowSystem
-
- onCompositingActiveChanged: {
- visibilityManager.updateMaskArea();
- }
- }
-
- ////END interfaces
-
/////BEGIN: Title Tooltip///////////
PlasmaCore.Dialog{
id: titleTooltipDialog