1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
From 8f85c4658adfdf7a01c591afd79baa9eed8b79dd Mon Sep 17 00:00:00 2001
From: Bharadwaj Raju <bharadwaj.raju777@protonmail.com>
Date: Tue, 12 Apr 2022 15:01:15 +0000
Subject: [PATCH] Folder View: save desktop containment icon positions on a
per-resolution basis
BUG: 360478
BUG: 354802
FIXED-IN: 5.24.5
(cherry picked from commit 2dca17060c06f85abc365bab9484ee4446d78772)
---
.../package/contents/ui/FolderView.qml | 15 +--------
.../package/contents/ui/FolderViewLayer.qml | 32 +++++++++++++++++--
.../desktop/plugins/folder/positioner.cpp | 1 +
3 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
index 218a3da77..72ae4903a 100644
--- a/containments/desktop/package/contents/ui/FolderView.qml
+++ b/containments/desktop/package/contents/ui/FolderView.qml
@@ -30,6 +30,7 @@ FocusScope {
property alias currentIndex: gridView.currentIndex
property alias url: dir.url
property alias status: dir.status
+ property alias perStripe: positioner.perStripe
property alias positions: positioner.positions
property alias errorString: dir.errorString
property alias dragging: dir.dragging
@@ -828,20 +829,6 @@ FocusScope {
}
}
- onFlowChanged: {
- // FIXME TODO: Preserve positions.
- if (positioner.enabled) {
- positioner.reset();
- }
- }
-
- onLayoutDirectionChanged: {
- // FIXME TODO: Preserve positions.
- if (positioner.enabled) {
- positioner.reset();
- }
- }
-
onCurrentIndexChanged: {
positionViewAtIndex(currentIndex, GridView.Contain);
}
diff --git a/containments/desktop/package/contents/ui/FolderViewLayer.qml b/containments/desktop/package/contents/ui/FolderViewLayer.qml
index 3f9b29937..f2044e1b0 100644
--- a/containments/desktop/package/contents/ui/FolderViewLayer.qml
+++ b/containments/desktop/package/contents/ui/FolderViewLayer.qml
@@ -29,6 +29,8 @@ FocusScope {
property alias overflowing: folderView.overflowing
property alias flow: folderView.flow
+ property string resolution: Math.round(plasmoid.screenGeometry.width) + "x" + Math.round(plasmoid.screenGeometry.height)
+
readonly property bool lockedByKiosk: !KAuthorized.authorize("editable_desktop_icons")
focus: true
@@ -178,6 +180,26 @@ FocusScope {
}
}
+ function getPositions() {
+ try {
+ var allPositions = JSON.parse(plasmoid.configuration.positions);
+ } catch (err) {
+ var allPositions = {};
+ allPositions[resolution] = plasmoid.configuration.positions;
+ }
+ return allPositions[resolution] || "";
+ }
+
+ function savePositions(positions) {
+ try {
+ var allPositions = JSON.parse(plasmoid.configuration.positions);
+ } catch (err) {
+ var allPositions = {};
+ }
+ allPositions[resolution] = positions;
+ plasmoid.configuration.positions = JSON.stringify(allPositions, Object.keys(allPositions).sort());
+ }
+
Connections {
target: plasmoid.configuration
@@ -211,7 +233,7 @@ FocusScope {
}
function onPositionsChanged() {
- folderView.positions = plasmoid.configuration.positions;
+ folderView.positions = getPositions();
}
}
@@ -241,12 +263,16 @@ FocusScope {
}
onPositionsChanged: {
- plasmoid.configuration.positions = folderView.positions;
+ savePositions(folderView.positions);
+ }
+
+ onPerStripeChanged: {
+ folderView.positions = getPositions();
}
Component.onCompleted: {
folderView.sortMode = plasmoid.configuration.sortMode;
- folderView.positions = plasmoid.configuration.positions;
+ folderView.positions = getPositions();
}
}
diff --git a/containments/desktop/plugins/folder/positioner.cpp b/containments/desktop/plugins/folder/positioner.cpp
index 859c16754..3b2df8c5a 100644
--- a/containments/desktop/plugins/folder/positioner.cpp
+++ b/containments/desktop/plugins/folder/positioner.cpp
@@ -854,6 +854,7 @@ void Positioner::applyPositions()
}
if (pos > m_perStripe) {
+ qDebug() << "Some items did not fit, rearranging";
name = positions.at(offset);
if (!sourceIndices.contains(name)) {
--
GitLab
|
GitWeb