Differential D24265 Diff 67898 toolboxes/desktoptoolbox/contents/ui/ToolBoxRoot.qml

Changeset View

Standalone View

View Options

toolboxes/desktoptoolbox/contents/ui/ToolBoxRoot.qml

Show All 33 Lines31Item {
34 34​
35 z: 999 35​ z: 999
36 anchors.fill: parent 36​ anchors.fill: parent
37 37​
38 Connections { 38​ Connections {
39 target: plasmoid 39​ target: plasmoid
40 onAvailableScreenRegionChanged: placeToolBoxTimer.restart(); 40​ onAvailableScreenRegionChanged: placeToolBoxTimer.restart();
41 } 41​ }
42 42​/*
davidedmundsonUnsubmitted
Done

fix

davidedmundson: fix
43 //FIXME: this timer shouldn't exist, but unfortunately when the focus passes ​
44 //from the desktop to the dialog or vice versa, the event is not atomic ​
45 //and ends up with neither of those having focus, hiding the dialog when ​
46 //it shouldn't ​
47 Timer { ​
48 id: hideDialogTimer ​
49 interval: 0 ​
50 //NOTE: it's checking activeFocusItem instead of active as active doesn't correctly signal its change ​
51 property bool desktopOrDialogFocus: main.Window.activeFocusItem !== null || (toolBoxLoader.item && toolBoxLoader.item.activeFocusItem !== null) ​
52 onDesktopOrDialogFocusChanged: { ​
53 if (!desktopOrDialogFocus) { ​
54 hideDialogTimer.restart(); ​
55 } ​
56 ​
57 } ​
58 onTriggered: { ​
59 if (!desktopOrDialogFocus) { ​
60 open = false; ​
61 } ​
62 } ​
63 } ​
64 ​
65 signal minimumWidthChanged 43​ signal minimumWidthChanged
66 signal minimumHeightChanged 44​ signal minimumHeightChanged
67 signal maximumWidthChanged 45​ signal maximumWidthChanged
68 signal maximumHeightChanged 46​ signal maximumHeightChanged
69 signal preferredWidthChanged 47​ signal preferredWidthChanged
70 signal preferredHeightChanged 48​ signal preferredHeightChanged
71 49​*/
72 property int iconSize: units.iconSizes.small 50​ property int iconSize: units.iconSizes.small
73 property int iconWidth: units.iconSizes.smallMedium 51​ property int iconWidth: units.iconSizes.smallMedium
74 property int iconHeight: iconWidth 52​ property int iconHeight: iconWidth
75 property bool dialogWasVisible: false 53​ property bool dialogWasVisible: false
76 property bool open: false 54​ property bool open: false
77 onOpenChanged: { ​
78 plasmoid.editMode = open ​
79 if (open) { ​
80 plasmoid.contextualActionsAboutToShow(); ​
81 ​
82 toolBoxLoader.active = true; ​
83 toolBoxLoader.item.visible = true; ​
84 } else { ​
85 toolBoxLoader.item.visible = false; ​
86 } ​
87 } ​
88 55​
89 onWidthChanged: placeToolBoxTimer.restart(); 56​ onWidthChanged: placeToolBoxTimer.restart();
90 onHeightChanged: placeToolBoxTimer.restart(); 57​ onHeightChanged: placeToolBoxTimer.restart();
91 58​
92 LayoutMirroring.enabled: (Qt.application.layoutDirection === Qt.RightToLeft) 59​ LayoutMirroring.enabled: (Qt.application.layoutDirection === Qt.RightToLeft)
93 LayoutMirroring.childrenInherit: true 60​ LayoutMirroring.childrenInherit: true
94 61​
95 onVisibleChanged: { ​
96 if (!visible && toolBoxLoader.item) { ​
97 toolBoxLoader.item.visible = false ​
98 } ​
99 } ​
100 ​
101 ToolBoxButton { 62​ ToolBoxButton {
102 id: toolBoxButton 63​ id: toolBoxButton
103 visible: false 64​ visible: false
104 Component.onCompleted: { 65​ Component.onCompleted: {
105 placeToolBox(plasmoid.configuration.ToolBoxButtonState); 66​ placeToolBox(plasmoid.configuration.ToolBoxButtonState);
106 toolBoxButton.visible = true 67​ toolBoxButton.visible = true
107 } 68​ }
108 } 69​ }
109 70​
110 Timer { 71​ Timer {
111 id: placeToolBoxTimer 72​ id: placeToolBoxTimer
112 interval: 100 73​ interval: 100
113 repeat: false 74​ repeat: false
114 running: false 75​ running: false
115 onTriggered: { 76​ onTriggered: {
116 placeToolBox(plasmoid.configuration.ToolBoxButtonState); 77​ placeToolBox(plasmoid.configuration.ToolBoxButtonState);
117 } 78​ }
118 } 79​ }
119 80​
120 Loader { ​
121 id: toolBoxLoader ​
122 active: false ​
123 sourceComponent: PlasmaCore.Dialog { ​
124 id: dialog ​
125 flags: Qt.WindowStaysOnTopHint ​
126 location: PlasmaCore.Types.Floating ​
127 visualParent: toolBoxButton ​
128 // hideOnWindowDeactivate: true ​
129 mainItem: ToolBoxItem { ​
130 LayoutMirroring.enabled: Qt.application.layoutDirection === Qt.RightToLeft ​
131 LayoutMirroring.childrenInherit: true ​
132 ​
133 Timer { ​
134 id: visibleTimer ​
135 interval: 300 ​
136 onTriggered: main.dialogWasVisible = dialog.visible ​
137 } ​
138 } ​
139 onVisibleChanged: visibleTimer.restart(); ​
140 } ​
141 } ​
142 ​
143 function placeToolBox(ts) { 81​ function placeToolBox(ts) {
144 // if nothing has been setup yet, determine default position based on layout direction 82​ // if nothing has been setup yet, determine default position based on layout direction
145 if (!ts) { 83​ if (!ts) {
146 if (Qt.application.layoutDirection === Qt.RightToLeft) { 84​ placeToolBox("topcenter");
147 placeToolBox("topleft"); ​
148 } else { ​
149 placeToolBox("topright"); ​
150 } ​
151 return; 85​ return;
152 } 86​ }
153 87​
154 var tx = Plasmoid.configuration.ToolBoxButtonX 88​ var tx = Plasmoid.configuration.ToolBoxButtonX
155 var ty = Plasmoid.configuration.ToolBoxButtonY 89​ var ty = Plasmoid.configuration.ToolBoxButtonY
156 var pos; 90​ var pos;
157 91​
158 switch (ts) { 92​ switch (ts) {
159 case "top": 93​ case "top":
160 ty = main.y; 94​ ty = main.y;
161 pos = plasmoid.adjustToAvailableScreenRegion(tx, ty, toolBoxButton.width, toolBoxButton.height); 95​ pos = plasmoid.adjustToAvailableScreenRegion(tx, ty, toolBoxButton.width, toolBoxButton.height);
162 break; 96​ break;
163 case "left": 97​ case "left":
164 tx = main.x; 98​ tx = main.x;
165 pos = plasmoid.adjustToAvailableScreenRegion(tx, ty, toolBoxButton.width, toolBoxButton.height); 99​ pos = plasmoid.adjustToAvailableScreenRegion(tx, ty, toolBoxButton.width, toolBoxButton.height);
166 break; 100​ break;
167 case "right": 101​ case "right":
168 tx = main.width + main.x - toolBoxButton.width; 102​ tx = main.width + main.x - toolBoxButton.width;
169 pos = plasmoid.adjustToAvailableScreenRegion(tx, ty, toolBoxButton.width, toolBoxButton.height); 103​ pos = plasmoid.adjustToAvailableScreenRegion(tx, ty, toolBoxButton.width, toolBoxButton.height);
170 break; 104​ break;
171 case "bottom": 105​ case "bottom":
172 ty = main.height + main.y - toolBoxButton.height; 106​ ty = main.height + main.y - toolBoxButton.height;
173 pos = plasmoid.adjustToAvailableScreenRegion(tx, ty, toolBoxButton.width, toolBoxButton.height); 107​ pos = plasmoid.adjustToAvailableScreenRegion(tx, ty, toolBoxButton.width, toolBoxButton.height);
174 break; 108​ break;
175 case "topleft": 109​ case "bottomcenter":
176 tx = main.x; 110​ tx = main.width / 2 - toolBoxButton.width / 2;
177 ty = main.y; 111​ ty = main.height + main.y - toolBoxButton.height;
178 pos = plasmoid.adjustToAvailableScreenRegion(tx, ty, toolBoxButton.height, toolBoxButton.height); 112​ pos = plasmoid.adjustToAvailableScreenRegion(tx, ty, toolBoxButton.width, toolBoxButton.height);
179 break; ​
180 case "topright": ​
181 tx = main.width + main.x - toolBoxButton.height; ​
182 ty = main.y; ​
183 pos = plasmoid.adjustToAvailableScreenRegion(tx, ty, toolBoxButton.height, toolBoxButton.height); ​
184 break; 113​ break;
185 case "bottomleft": 114​ case "leftcenter":
186 tx = main.x; 115​ tx = main.x;
187 ty = main.height + main.y - toolBoxButton.height; 116​ ty = main.height - toolBoxButton.width / 2;
188 pos = plasmoid.adjustToAvailableScreenRegion(tx, ty, toolBoxButton.height, toolBoxButton.height); 117​ pos = plasmoid.adjustToAvailableScreenRegion(tx, ty, toolBoxButton.width, toolBoxButton.height);
118​ break;
119​ case "rightcenter":
120​ tx = main.width + main.x - toolBoxButton.width;
121​ ty = main.height - toolBoxButton.width / 2;
122​ pos = plasmoid.adjustToAvailableScreenRegion(tx, ty, toolBoxButton.width, toolBoxButton.height);
189 break; 123​ break;
190 case "bottomright": 124​ case "topcenter":
191 default: 125​ default:
192 tx = main.width + main.x - toolBoxButton.height; 126​ tx = main.width / 2 - toolBoxButton.width / 2;
193 ty = main.height + main.y - toolBoxButton.height; 127​ ty = main.y;
194 pos = plasmoid.adjustToAvailableScreenRegion(tx, ty, toolBoxButton.height, toolBoxButton.height); 128​ pos = plasmoid.adjustToAvailableScreenRegion(tx, ty, toolBoxButton.width, toolBoxButton.height);
195 break; 129​ break;
196 } 130​ }
197 //print("XXXY Setting toolbox to: " + ts + " " + tx + "x" + ty + " screen: " + main.width+ "x" + main.height+""); 131​ //print("XXXY Setting toolbox to: " + ts + " " + tx + "x" + ty + " screen: " + main.width+ "x" + main.height+"");
198 132​
199 toolBoxButton.x = pos.x; 133​ toolBoxButton.x = pos.x;
200 toolBoxButton.y = pos.y; 134​ toolBoxButton.y = pos.y;
201 } 135​ }
202} 136​}