Differential D4204 Diff 10408 containments/desktop/package/contents/ui/AppletAppearance.qml

Changeset View

Standalone View

View Options

containments/desktop/package/contents/ui/AppletAppearance.qml

Show All 36 Lines31Item {
37 property string category 37​ property string category
38 38​
39 property bool showAppletHandle: false 39​ property bool showAppletHandle: false
40 property real controlsOpacity: (plasmoid.immutable || !showAppletHandle) ? 0 : 1 40​ property real controlsOpacity: (plasmoid.immutable || !showAppletHandle) ? 0 : 1
41 property string backgroundHints: "NoBackground" 41​ property string backgroundHints: "NoBackground"
42 property bool hasBackground: false 42​ property bool hasBackground: false
43 property bool handleMerged: (height > minimumHandleHeight && !appletHandle.forceFloating) 43​ property bool handleMerged: (height > minimumHandleHeight && !appletHandle.forceFloating)
44 property bool animationsEnabled: false 44​ property bool animationsEnabled: false
45​ property bool floating: true // turns off layoutManagment space handling for appletItem
45 46​
46 property int minimumWidth: Math.max(root.layoutManager.cellSize.width, 47​ property alias innerEndHeight: mouseListener.endHeight
48​ property alias innerEndWidth: mouseListener.endWidth
49​ property alias innerHeight: mouseListener.height
50​ property alias innerWidth: mouseListener.width
martUnsubmitted
Not Done

mouseListener just has a simple anchors.fill:parent to this, so makes innerWidth/innerHeight redundant as they are the same as the parent?

mart: mouseListener just has a simple anchors.fill:parent to this, so makes innerWidth/innerHeight…
davidedmundsonUnsubmitted
Not Done

It did. It doesn't after this patch.

It's detached so that appletItem can store the final width/height and this container then animates to that position.

davidedmundson: It did. It doesn't after this patch. It's detached so that appletItem can store the final…
51​
52​ // bindings needed for handling situation when minimum > maximum
53​ // they would not break in js assignment
54​ property int minimumWidth
55​ Binding on minimumWidth {
56​ value: Math.max(root.layoutManager.cellSize.width,
47 appletContainer.minimumWidth + 57​ appletContainer.minimumWidth +
48 appletItem.contents.anchors.leftMargin + 58​ appletContainer.anchors.leftMargin +
49 appletItem.contents.anchors.rightMargin) 59​ appletContainer.anchors.rightMargin - handleWidth);
davidedmundsonUnsubmitted
Done

why are you including handleWidth here?

From what I can see in the code;
appletItem should be the the size of the applet + normal margins

Then on line 290 it creates a container that's bigger than the parent item and does include the handle

davidedmundson: why are you including handleWidth here? From what I can see in the code; appletItem should be…
60​ }
50 61​
51 property int minimumHeight: Math.max(root.layoutManager.cellSize.height, 62​ property int minimumHeight
63​ Binding on minimumHeight {
64​ value: Math.max(root.layoutManager.cellSize.height,
52 appletContainer.minimumHeight + 65​ appletContainer.minimumHeight +
53 appletItem.contents.anchors.topMargin + 66​ appletContainer.anchors.topMargin +
54 appletItem.contents.anchors.bottomMargin) 67​ appletContainer.anchors.bottomMargin);
68​ }
69​
70​ property int maximumWidth
71​ Binding on maximumWidth {
72​ value: appletContainer.maximumWidth +
73​ appletContainer.anchors.leftMargin +
74​ appletContainer.anchors.rightMargin - handleWidth;
75​ }
76​
77​ property int maximumHeight
78​ Binding on maximumHeight {
79​ value: appletContainer.maximumHeight +
80​ appletContainer.anchors.topMargin +
81​ appletContainer.anchors.bottomMargin;
82​ }
davidedmundsonUnsubmitted
Not Done

why do you do

property int foo
Binding on foo {
value: Math.max()
}

instead of just

property int foo: Math.max

?

davidedmundson: why do you do property int foo Binding on foo { value: Math.max() } instead of just…
konstantinshtepaAuthorUnsubmitted
Not Done

Binding on properties used because these properties assigned in JS(in handlers onMinimumWidthChanged and others) as lvalue and it breaks normal bindings. If someone could bring better idea how to handle situation when minimum size > maximum size without these bindings then they can be removed.

konstantinshtepa: Binding on properties used because these properties assigned in JS(in handlers…
55 83​
56 property alias applet: appletContainer.applet 84​ property alias applet: appletContainer.applet
57 85​
58 property Item contents: appletContainer 86​ property Item contents: appletContainer
59 property alias margins: plasmoidBackground.margins 87​ property alias margins: plasmoidBackground.margins
60 property alias imagePath: plasmoidBackground.imagePath 88​ property alias imagePath: plasmoidBackground.imagePath
61 89​
62 visible: false 90​ visible: false
63 91​
64 onMinimumWidthChanged: if (!widthAnimation.running) appletItem.width = Math.max(minimumWidth, width); 92​ QtObject {
65 onMinimumHeightChanged: if (!heightAnimation.running) appletItem.height = Math.max(minimumHeight, height); 93​ id: d
94​
95​ property real lastX: 0
96​ property real lastY: 0
97​ }
98​
99​ onMinimumWidthChanged: {
100​ if (minimumWidth > maximumWidth)
101​ maximumWidth = minimumWidth;
davidedmundsonUnsubmitted
Not Done

this is broken.

if I'm an applet and do:
Plasmoid.Layout.maximumWidth = 50

this appletItem.maximumWidth == 58 (assuming 4px margins)
which is correct

Now if I do:

Plasmoid.Layout.minimumWidth = 60

this appletItem.maximumWidth == 68
which is also fine, we've set it to the minimum + margins

But, now if I do:

Plasmoid.Layout.maximumWidth = 70
this appletItem.maximumWidth == 68

because we've broken the binding.

We're going to need to move the

if (minimumWidth > maximumWidth)
maximumWidth = minimumWidth;

logic somewhere lower.
Either into appletContainer or even AppletQuickItem where it does the proxying.

davidedmundson: this is broken. if I'm an applet and do: Plasmoid.Layout.maximumWidth = 50 this appletItem.
konstantinshtepaAuthorUnsubmitted
Not Done

That's strange. I didn't expirienced any of this when testing.
Binding on level appletItem.maximumWidth shouldn't be broken because they based on external Binding QML element.
I will look into this.

konstantinshtepa: That's strange. I didn't expirienced any of this when testing. Binding on level appletItem.
102​ if (width < minimumWidth) {
103​ releasePosition();
104​ width = minimumWidth;
105​ positionItem();
106​ if (showAppletHandle && !handleMerged)
107​ appletHandle.positionHandle();
108​ }
109​ }
110​ onMinimumHeightChanged: {
111​ if (minimumHeight > maximumHeight)
112​ maximumHeight = minimumHeight;
113​ if (height < minimumHeight) {
114​ releasePosition();
115​ height = minimumHeight;
116​ positionItem();
117​ if (showAppletHandle && !handleMerged)
118​ appletHandle.positionHandle();
119​ }
120​ }
121​
122​ onMaximumWidthChanged: {
123​ if (maximumWidth < minimumWidth)
124​ minimumWidth = maximumWidth;
125​ if (width > maximumWidth) {
126​ releasePosition();
127​ width = maximumWidth;
128​ positionItem();
129​ if (showAppletHandle && !handleMerged)
130​ appletHandle.positionHandle();
131​ }
132​ }
133​ onMaximumHeightChanged: {
134​ if (maximumHeight < minimumHeight)
135​ minimumHeight = maximumHeight;
136​ if (height > maximumHeight) {
137​ releasePosition();
138​ height = maximumHeight;
139​ positionItem();
140​ if (showAppletHandle && !handleMerged)
141​ appletHandle.positionHandle();
142​ }
143​ }
144​
145​ onHeightChanged: {
146​ if (height > maximumHeight)
147​ innerEndHeight = maximumHeight;
148​ else if (height < minimumHeight)
149​ innerEndHeight = minimumHeight;
150​ else
151​ innerEndHeight = height;
152​ }
153​ onWidthChanged: {
154​ if (width > maximumWidth)
155​ innerEndWidth = maximumWidth;
156​ else if (width < minimumWidth)
157​ innerEndWidth = minimumWidth;
158​ else
159​ innerEndWidth = width;
160​ }
161​
162​ onXChanged: {
163​ if (animationsEnabled) {
164​ animationsEnabled = false;
165​ mouseListener.x += d.lastX - x;
166​ animationsEnabled = true;
167​ }
168​ mouseListener.x = mouseListener.endX = (width - innerEndWidth)/2;
169​ d.lastX = x;
170​ }
171​ onYChanged: {
172​ if (animationsEnabled) {
173​ animationsEnabled = false;
174​ mouseListener.y += d.lastY - y;
175​ animationsEnabled = true;
176​ }
177​ mouseListener.y = mouseListener.endY = (height - innerEndHeight)/2;
178​ d.lastY = y;
179​ }
180​
181​ // use this function to position appletItem instead of root.layoutManager.positionItem(appletItem)
182​ function positionItem() {
183​ if (floating)
184​ return;
185​ var tempItem = {
186​ x: appletItem.x,
187​ y: appletItem.y,
188​ width: appletItem.innerEndWidth,
189​ height: appletItem.innerEndHeight,
190​ minimumHeight: appletItem.minimumHeight,
191​ minimumWidth: appletItem.minimumWidth };
192​ root.layoutManager.positionItem(tempItem);
193​ x = tempItem.x;
194​ y = tempItem.y;
195​ height = tempItem.height;
196​ width = tempItem.width;
197​ root.layoutManager.saveItem(appletItem);
198​ }
199​
200​ // use this function to free appletItem position instead of
201​ // root.layoutManager.setSpaceAvailable(appletItem.x, appletItem.y, appletItem.width, appletItem.height, true)
202​ function releasePosition() {
203​ if (!floating)
204​ root.layoutManager.setSpaceAvailable(x, y, width, height, true);
205​ }
66 206​
67 function updateBackgroundHints() { 207​ function updateBackgroundHints() {
68 hasBackground = (applet.backgroundHints != "NoBackground"); 208​ hasBackground = (applet.backgroundHints != "NoBackground");
69 if (applet.backgroundHints == 1) { 209​ if (applet.backgroundHints == 1) {
70 appletItem.imagePath = "widgets/background"; 210​ appletItem.imagePath = "widgets/background";
71 backgroundHints = "StandardBackground"; 211​ backgroundHints = "StandardBackground";
72 } else if (applet.backgroundHints == 2) { 212​ } else if (applet.backgroundHints == 2) {
73 appletItem.imagePath = "widgets/translucentbackground" 213​ appletItem.imagePath = "widgets/translucentbackground"
74 backgroundHints = "TranslucentBackground"; 214​ backgroundHints = "TranslucentBackground";
75 } else if (applet.backgroundHints == 0) { 215​ } else if (applet.backgroundHints == 0) {
76 appletItem.imagePath = "" 216​ appletItem.imagePath = ""
77 backgroundHints = "NoBackground"; 217​ backgroundHints = "NoBackground";
78 } else { 218​ } else {
79 backgroundHints = "DefaultBackground"; 219​ backgroundHints = "DefaultBackground";
80 appletItem.imagePath = "widgets/background"; 220​ appletItem.imagePath = "widgets/background";
81 } 221​ }
82 //print("Backgroundhints changed: " + appletItem.imagePath); 222​ //print("Backgroundhints changed: " + appletItem.imagePath);
83 } 223​ }
84 224​
85 KQuickControlsAddons.MouseEventListener { 225​ KQuickControlsAddons.MouseEventListener {
davidedmundsonUnsubmitted
Not Done

Point is a native QML type.
http://doc.qt.io/qt-5/qml-point.html

property point lastPoint

then use that in your logic above.
It can be better because you then get one signal when it changes not two.

davidedmundson: Point is a native QML type. http://doc.qt.io/qt-5/qml-point.html property point lastPoint…
konstantinshtepaAuthorUnsubmitted
Not Done

You can go without links. I know Qt, commited there.
One signal when it doesn't have any handlers or bindings wouldn't change any weather in QML. Point too have it's negative sides because it needs inverpretation "lastPoint.x". The question here is maybe I should have used int too as a base to properties(to maintain policy of int-based sizes).

konstantinshtepa: You can go without links. I know Qt, commited there. One signal when it doesn't have any…
86 id: mouseListener 226​ id: mouseListener
227​ // used as inner applet (which would not be sized over or under size limits )
228​ // centered in appletItem.onXChanged and onYChanged due to allow animations on X and Y
87 229​
88 anchors { 230​ property int pressX: -1
89 fill: parent 231​ property int pressY: -1
90 } 232​
233​ // for animations
234​ property int endHeight: minimumHeight
235​ property int endWidth: minimumWidth
236​ property int endX: 0
237​ property int endY: 0
238​
239​ height: endHeight
240​ width: endWidth
91 z: 10 241​ z: 10
92 242​
93 hoverEnabled: true 243​ hoverEnabled: true
94 244​
95 property int pressX: -1 ​
96 property int pressY: -1 ​
97 ​
98 onPressed: { 245​ onPressed: {
99 pressX = mouse.x; 246​ pressX = mouse.x;
100 pressY = mouse.y; 247​ pressY = mouse.y;
101 } 248​ }
102 249​
103 onPressAndHold: { 250​ onPressAndHold: {
104 if (!plasmoid.immutable && plasmoid.configuration.pressToMove) { 251​ if (!plasmoid.immutable && plasmoid.configuration.pressToMove) {
105 if (!dragMouseArea.dragging && !root.isDrag(pressX, pressY, mouse.x, mouse.y)) { 252​ if (!dragMouseArea.dragging && !root.isDrag(pressX, pressY, mouse.x, mouse.y)) {
Show All 32 Lines284 } else if (!dragMouseArea.dragging) {
138 showAppletHandle = false; 285​ showAppletHandle = false;
139 } 286​ }
140 } 287​ }
141 } 288​ }
142 289​
143 Item { 290​ Item {
144 anchors { left: parent.left; top: parent.top; bottom: parent.bottom; } 291​ anchors { left: parent.left; top: parent.top; bottom: parent.bottom; }
145 width: parent.width+handleWidth; 292​ width: parent.width+handleWidth;
146 ​
147 z: mouseListener.z + 4 293​ z: mouseListener.z + 4
148 294​
149 PlasmaCore.FrameSvgItem { 295​ PlasmaCore.FrameSvgItem {
150 id: plasmoidBackground 296​ id: plasmoidBackground
151 visible: backgroundHints != PlasmaCore.Types.NoBackground 297​ visible: backgroundHints != PlasmaCore.Types.NoBackground
152 imagePath: "widgets/background" 298​ imagePath: "widgets/background"
153 anchors { left: parent.left; top: parent.top; bottom: parent.bottom; } 299​ anchors { left: parent.left; top: parent.top; bottom: parent.bottom; }
154 width: (showAppletHandle && handleMerged) ? parent.width : parent.width-handleWidth; 300​ width: (showAppletHandle && handleMerged) ? parent.width : parent.width-handleWidth;
155 smooth: true 301​ smooth: true
156 ​
157 Behavior on width { ​
158 enabled: animationsEnabled ​
159 NumberAnimation { ​
160 duration: units.longDuration ​
161 easing.type: Easing.InOutQuad ​
162 } ​
163 } ​
164 } 302​ }
165 303​
166 Connections { 304​ Connections {
167 target: plasmoid 305​ target: plasmoid
168 onImmutableChanged: { 306​ onImmutableChanged: {
169// print(" TB dragMouseArea.visible: " + plasmoid.immutable) 307​// print(" TB dragMouseArea.visible: " + plasmoid.immutable)
170 dragMouseArea.visible = !plasmoid.immutable; 308​ dragMouseArea.visible = !plasmoid.immutable;
171 showAppletHandle = false; 309​ showAppletHandle = false;
172 } 310​ }
173 onAppletRemoved: { 311​ onAppletRemoved: {
174// print("Applet removed Applet-" + applet.id) 312​// print("Applet removed Applet-" + applet.id)
175 if (applet.id == appletItem.applet.id) { 313​ if (applet.id == appletItem.applet.id) {
176// print("Destroying Applet-" + applet.id) 314​// print("Destroying Applet-" + applet.id)
177 root.layoutManager.saveRotation(appletItem); 315​ root.layoutManager.saveRotation(appletItem);
178 root.layoutManager.setSpaceAvailable(appletItem.x, appletItem.y, appletItem.width, appletItem.height, true) 316​ appletItem.releasePosition();
179 //applet.action("remove").trigger(); 317​ //applet.action("remove").trigger();
180 //appletItem.destroy() 318​ //appletItem.destroy()
181 appletItem.destroy(); 319​ appletItem.destroy();
182 } 320​ }
183 } 321​ }
184 } 322​ }
185 Connections { 323​ Connections {
186 target: applet 324​ target: applet
Show All 22 Lines338 MouseArea {
209 drag.target: appletItem 347​ drag.target: appletItem
210 property bool dragging: false // Set by mouseListener.onPressAndHold -- drag.active only becomes true on movement. 348​ property bool dragging: false // Set by mouseListener.onPressAndHold -- drag.active only becomes true on movement.
211 349​
212 function endDrag() { 350​ function endDrag() {
213 appletItem.z = appletItem.z - zoffset; 351​ appletItem.z = appletItem.z - zoffset;
214 repositionTimer.running = false; 352​ repositionTimer.running = false;
215 placeHolderPaint.opacity = 0; 353​ placeHolderPaint.opacity = 0;
216 animationsEnabled = true; 354​ animationsEnabled = true;
217 root.layoutManager.positionItem(appletItem); 355​ appletItem.floating = false;
356​ appletItem.positionItem();
218 root.layoutManager.save(); 357​ root.layoutManager.save();
219 dragging = false; 358​ dragging = false;
220 } 359​ }
221 360​
222 onDraggingChanged: { 361​ onDraggingChanged: {
223 cursorShape = dragging ? Qt.DragMoveCursor : Qt.ArrowCursor; 362​ cursorShape = dragging ? Qt.DragMoveCursor : Qt.ArrowCursor;
224 } 363​ }
225 364​
226 onPressed: { 365​ onPressed: {
227 appletItem.z = appletItem.z + zoffset; 366​ appletItem.z = appletItem.z + zoffset;
228 animationsEnabled = plasmoid.configuration.pressToMove ? true : false; 367​ animationsEnabled = false;
229 mouse.accepted = true; 368​ mouse.accepted = true;
230 root.layoutManager.setSpaceAvailable(appletItem.x, appletItem.y, appletItem.width, appletItem.height, true); 369​ appletItem.releasePosition();
370​ appletItem.floating = true;
231 371​
232 placeHolder.syncWithItem(appletItem); 372​ placeHolder.syncWithItem(appletItem);
233 placeHolderPaint.opacity = root.haloOpacity; 373​ placeHolderPaint.opacity = root.haloOpacity;
234 } 374​ }
235 375​
236 onPositionChanged: { 376​ onPositionChanged: {
237 var pos = mapToItem(root.parent, mouse.x, mouse.y); 377​ var pos = mapToItem(root.parent, mouse.x, mouse.y);
238 var newCont = plasmoid.containmentAt(pos.x, pos.y); 378​ var newCont = plasmoid.containmentAt(pos.x, pos.y);
Show All 39 Lines417 size = { 'width': layout.minimumWidth,
278 'height': layout.minimumHeight }; 418​ 'height': layout.minimumHeight };
279 } else { 419​ } else {
280 size = { 'width': 0, 'height': 0 }; 420​ size = { 'width': 0, 'height': 0 };
281 } 421​ }
282 422​
283 return size; 423​ return size;
284 } 424​ }
285 425​
426​ property var maximumSize: {
427​ var size;
428​ if (applet && applet.Layout) {
429​ var layout = applet.Layout
430​ size = { 'width': layout.maximumWidth,
431​ 'height': layout.maximumHeight };
432​ } else {
433​ size = { 'width': Number.POSITIVE_INFINITY,
434​ 'height': Number.POSITIVE_INFINITY };
435​
436​ }
437​ var maxInt = 1000000; // dirty hack to convert js number to qml int
438​ if (size.width > maxInt)
davidedmundsonUnsubmitted
Not Done

if maximum is infinite, (so undefined in QtQuick.Layouts) set it to 1000000

why?
It's far easier to test for isFinite() in other bits of code than a random big init

davidedmundson: if maximum is infinite, (so undefined in QtQuick.Layouts) set it to 1000000 why? It's far…
konstantinshtepaAuthorUnsubmitted
Not Done

Just a few lines below this size is assigned for property with int as a base. Then this property is used in operations with others int-based kde sizes. And keep it as double is not a option because of default Qt maximumSize(Number.POSITIVE_INFINITY). So there goes 1000000. Is there better way?

konstantinshtepa: Just a few lines below this size is assigned for property with int as a base. Then this…
439​ size.width = maxInt;
440​ if (size.height > maxInt)
441​ size.height = maxInt;
442​
443​ return size;
444​ }
445​
286 property int minimumWidth: minimumSize.width; 446​ property int minimumWidth: minimumSize.width;
davidedmundsonUnsubmitted
Not Done

Edit, maybe it won't - that's why you have the separate Binding.

However changing this to:
minimumWidth: Math.min(minimumSize.width, maximumSize.width);

for all 4

would still be a bit cleaner as then appletItem can trust these values are correct

davidedmundson: Edit, maybe it won't - that's why you have the separate Binding. However changing this to…
konstantinshtepaAuthorUnsubmitted
Not Done

Ok. I didn't think about this possibility. Maybe you are right and it would be better. If so then I can remove separate bindings. I will test it.

konstantinshtepa: Ok. I didn't think about this possibility. Maybe you are right and it would be better. If so…
konstantinshtepaAuthorUnsubmitted
Not Done

It wouldn't work.
For example:
plasmoid.Layout.minimumHeight = 150
plasmoid.Layout.maximumHeight = 200
plasmoid.Layout.maximumHeight = 130
On third step it would think that maximumHeight = 150 and minimumHeight = 130, when it should think that maximumHeight = minimumHeight = 130.

konstantinshtepa: It wouldn't work. For example: plasmoid.Layout.minimumHeight = 150 plasmoid.Layout.
konstantinshtepaAuthorUnsubmitted
Not Done

Ok, I removed bindings at cost of two additional handlers.

konstantinshtepa: Ok, I removed bindings at cost of two additional handlers.
287 property int minimumHeight: minimumSize.height; 447​ property int minimumHeight: minimumSize.height;
288 448​
449​ property int maximumWidth: maximumSize.width;
450​ property int maximumHeight: maximumSize.height;
451​
289 function appletDestroyed() { 452​ function appletDestroyed() {
290// print("Applet DESTROYED."); 453​// print("Applet DESTROYED.");
291 root.layoutManager.setSpaceAvailable(appletItem.x, appletItem.y, appletItem.width, appletItem.height, true) 454​ appletItem.releasePosition();
292 applet.action("remove").trigger(); 455​ applet.action("remove").trigger();
293 appletItem.destroy() 456​ appletItem.destroy()
294 } 457​ }
295 458​
296 onAppletChanged: { 459​ onAppletChanged: {
297 if (!applet) { 460​ if (!applet) {
298 return; 461​ return;
299 } 462​ }
300 ​
301 applet.parent = appletContainer; 463​ applet.parent = appletContainer;
302 applet.anchors.fill = appletContainer; 464​ applet.anchors.fill = appletContainer;
303 465​
304 updateBackgroundHints(); 466​ updateBackgroundHints();
305 } 467​ }
306 Connections { 468​ Connections {
307 target: appletHandle.item 469​ target: appletHandle.item
308 onRemoveApplet: { 470​ onRemoveApplet: {
▲ Show 20 Lines • Show All 64 Lines • ▼ Show 20 Line(s)534 onMoveFinished: {
373 appletHandle.positionHandle(); 535​ appletHandle.positionHandle();
374 } 536​ }
375 } 537​ }
376 538​
377 function positionHandle() 539​ function positionHandle()
378 { 540​ {
379 // Don't show handle outside of desktop 541​ // Don't show handle outside of desktop
380 var available = plasmoid.availableScreenRect; 542​ var available = plasmoid.availableScreenRect;
381 var x = Math.min(Math.max(0, appletItem.x), available.width - appletItem.width); 543​ var x = Math.min(Math.max(0, appletItem.x + mouseListener.endX), available.width - appletItem.width + mouseListener.endX);
382 var y = Math.min(Math.max(0, appletItem.y), available.height - appletItem.height); 544​ var y = Math.min(Math.max(0, appletItem.y + mouseListener.endY), available.height - appletItem.height + mouseListener.endY);
383 var verticalCenter = (y + appletItem.height / 2); 545​ var verticalCenter = (y + mouseListener.endHeight / 2);
384 var topOutside = (verticalCenter - minimumHandleHeight / 2); 546​ var topOutside = (verticalCenter - minimumHandleHeight / 2);
385 var bottomOutside = verticalCenter + minimumHandleHeight / 2 - available.height; 547​ var bottomOutside = verticalCenter + minimumHandleHeight / 2 - available.height;
386 if (bottomOutside > 0) { 548​ if (bottomOutside > 0) {
387 anchors.verticalCenterOffset = -bottomOutside; 549​ anchors.verticalCenterOffset = -bottomOutside;
388 } else if (topOutside < 0) { 550​ } else if (topOutside < 0) {
389 anchors.verticalCenterOffset = -topOutside; 551​ anchors.verticalCenterOffset = -topOutside;
390 } else { 552​ } else {
391 anchors.verticalCenterOffset = 0; 553​ anchors.verticalCenterOffset = 0;
392 } 554​ }
393 var rightOutside = x + appletItem.width + handleWidth - available.width; 555​ var rightOutside = x + mouseListener.endWidth + handleWidth - available.width;
394 appletHandle.anchors.rightMargin = appletItem.margins.right + Math.max(0, rightOutside); 556​ appletHandle.anchors.rightMargin = appletItem.margins.right + Math.max(0, rightOutside);
395 appletHandle.forceFloating = rightOutside > 0; 557​ appletHandle.forceFloating = rightOutside > 0;
396 } 558​ }
397 } 559​ }
398 } 560​ }
399 } ​
400 561​
401 Behavior on controlsOpacity { ​
402 NumberAnimation { ​
403 duration: units.longDuration ​
404 easing.type: Easing.InOutQuad ​
405 } ​
406 } ​
407 Behavior on x { 562​ Behavior on x {
408 enabled: animationsEnabled 563​ enabled: animationsEnabled
409 NumberAnimation { 564​ NumberAnimation {
410 duration: units.longDuration 565​ duration: units.longDuration
411 easing.type: Easing.InOutQuad 566​ easing.type: Easing.InOutQuad
412 } 567​ }
413 } 568​ }
414 Behavior on y { 569​ Behavior on y {
Show All 14 Lines
429 Behavior on height { 584​ Behavior on height {
430 enabled: animationsEnabled 585​ enabled: animationsEnabled
431 NumberAnimation { 586​ NumberAnimation {
432 id: heightAnimation 587​ id: heightAnimation
433 duration: units.longDuration 588​ duration: units.longDuration
434 easing.type: Easing.InOutQuad 589​ easing.type: Easing.InOutQuad
435 } 590​ }
436 } 591​ }
592​ }
593​
594​ Behavior on controlsOpacity {
595​ NumberAnimation {
596​ duration: units.longDuration
597​ easing.type: Easing.InOutQuad
598​ }
599​ }
437 600​
438 Component.onCompleted: { 601​ Component.onCompleted: {
602​ floating = false;
439 layoutTimer.running = true 603​ layoutTimer.running = true
440 layoutTimer.restart() 604​ layoutTimer.restart()
441 visible = false 605​ visible = false
442 } 606​ }
443} 607​}