From e47775e2f40260eab5c420a55f9442af3d8c564e Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Tue, 2 Feb 2021 12:53:24 +0200
Subject: [PATCH] load dock config pages properly in stackview

--during the first startup
---
 .../configuration/LatteDockConfiguration.qml   | 18 ------------------
 .../configuration/pages/AppearanceConfig.qml   |  5 +++++
 .../configuration/pages/BehaviorConfig.qml     |  6 ++++++
 .../configuration/pages/EffectsConfig.qml      |  6 ++++++
 .../configuration/pages/TasksConfig.qml        |  9 +++++++--
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/shell/package/contents/configuration/LatteDockConfiguration.qml b/shell/package/contents/configuration/LatteDockConfiguration.qml
index 79e301c8d..7d779341c 100644
--- a/shell/package/contents/configuration/LatteDockConfiguration.qml
+++ b/shell/package/contents/configuration/LatteDockConfiguration.qml
@@ -438,18 +438,6 @@ FocusScope {
                         }
                     }
 
-                    Component.onCompleted: {
-                        push(behaviorPage);
-                        push(appearancePage);
-                        push(effectsPage);
-
-                        pop(effectsPage);
-                        pop(appearancePage);
-                        pop(behaviorPage);
-
-                        push(behaviorPage);
-                    }
-
                     onCurrentItemChanged: {
                         if (!currentItem) {
                             pagesStackView.forwardSliding = true;
@@ -486,12 +474,6 @@ FocusScope {
                     Pages.TasksConfig {
                         id: tasksPage
                         readonly property int pageIndex: tabBar.visibleStaticPages+index
-
-                        Component.onCompleted: {
-                            pagesStackView.replace(pagesStackView.currentItem, tasksPage);
-                            pagesStackView.forwardSliding = true;
-                            pagesStackView.replace(tasksPage, behaviorPage);
-                        }
                     }
                 }
             }
diff --git a/shell/package/contents/configuration/pages/AppearanceConfig.qml b/shell/package/contents/configuration/pages/AppearanceConfig.qml
index 2fcc38963..c58aade02 100644
--- a/shell/package/contents/configuration/pages/AppearanceConfig.qml
+++ b/shell/package/contents/configuration/pages/AppearanceConfig.qml
@@ -33,9 +33,14 @@ import org.kde.latte.components 1.0 as LatteComponents
 import org.kde.latte.private.containment 0.1 as LatteContainment
 
 PlasmaComponents.Page {
+    id: page
     Layout.maximumWidth: content.width + content.Layout.leftMargin * 2
     Layout.maximumHeight: content.height + units.smallSpacing * 2
 
+    Component.onCompleted: {
+        pagesStackView.push(page);
+    }
+
     Timer {
         id: syncGeometry
 
diff --git a/shell/package/contents/configuration/pages/BehaviorConfig.qml b/shell/package/contents/configuration/pages/BehaviorConfig.qml
index 759889a0d..8afd05669 100644
--- a/shell/package/contents/configuration/pages/BehaviorConfig.qml
+++ b/shell/package/contents/configuration/pages/BehaviorConfig.qml
@@ -34,9 +34,15 @@ import org.kde.latte.private.containment 0.1 as LatteContainment
 import "../../controls" as LatteExtraControls
 
 PlasmaComponents.Page {
+    id: page
     Layout.maximumWidth: content.width + content.Layout.leftMargin * 2
     Layout.maximumHeight: content.height + units.smallSpacing * 2
 
+    Component.onCompleted: {
+        pagesStackView.push(page);
+        pagesStackView.pop(page);
+    }
+
     ColumnLayout {
         id: content
 
diff --git a/shell/package/contents/configuration/pages/EffectsConfig.qml b/shell/package/contents/configuration/pages/EffectsConfig.qml
index 4a2b1619d..fef6bcab4 100644
--- a/shell/package/contents/configuration/pages/EffectsConfig.qml
+++ b/shell/package/contents/configuration/pages/EffectsConfig.qml
@@ -36,9 +36,15 @@ import org.kde.latte.private.containment 0.1 as LatteContainment
 import "../../controls" as LatteExtraControls
 
 PlasmaComponents.Page {
+    id: page
     Layout.maximumWidth: content.width + content.Layout.leftMargin * 2
     Layout.maximumHeight: content.height + units.smallSpacing
 
+    Component.onCompleted: {
+        pagesStackView.push(page);
+        pagesStackView.pop(page);
+    }
+
     ColumnLayout {
         id: content
         anchors.horizontalCenter: parent.horizontalCenter
diff --git a/shell/package/contents/configuration/pages/TasksConfig.qml b/shell/package/contents/configuration/pages/TasksConfig.qml
index b75a494aa..004ba2a46 100644
--- a/shell/package/contents/configuration/pages/TasksConfig.qml
+++ b/shell/package/contents/configuration/pages/TasksConfig.qml
@@ -32,13 +32,18 @@ import org.kde.latte.components 1.0 as LatteComponents
 import org.kde.latte.private.tasks 0.1 as LatteTasks
 
 PlasmaComponents.Page {
-    id: _tabsPage
+    id: _tasksPage
     Layout.maximumWidth: content.width + content.Layout.leftMargin * 2
     Layout.maximumHeight: content.height + units.smallSpacing * 2
 
     property bool disableAllWindowsFunctionality: tasks.configuration.hideAllTasks
 
-    readonly property bool isCurrentPage: (dialog.currentPage === _tabsPage)
+    readonly property bool isCurrentPage: (dialog.currentPage === _tasksPage)
+
+    Component.onCompleted: {
+        pagesStackView.push(_tasksPage);
+        pagesStackView.pop(_tasksPage);
+    }
 
     onIsCurrentPageChanged: {
         if (isCurrentPage && latteView.extendedInterface.latteTasksModel.count>1) {