on xenial help sign in
some improvements on the highlight
commit8670a748ecb7ee94a3574f979083cb7287a34e67 authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 21 Jul 2016, 14:28 (10 years ago) parent0da4b63
3 files changed+13−2
po/unity8.pot+1−1 qml/Stages/DesktopStage.qml+11−1 qml/Stages/Spread/DragToCloseArea.qml+1
po/unity8.pot+1−1
@@ -8,7 +8,7 @@ msgid ""
88msgstr ""
99"Project-Id-Version: unity8\n"
1010"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2016-07-19 17:55+0200\n"
11+"POT-Creation-Date: 2016-07-19 18:53+0200\n"
1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414"Language-Team: LANGUAGE <LL@li.org>\n"
qml/Stages/DesktopStage.qml+11−1
@@ -307,9 +307,14 @@ AbstractStage {
307307 }
308308 ]
309309 transitions: [
310+ Transition {
311+ from: "stagedrightedge"; to: "spread"
312+ PropertyAction { target: spreadItem; property: "highlightedIndex"; value: -1 }
313+ },
310314 Transition {
311315 to: "spread"
312316 PropertyAction { target: spreadItem; property: "highlightedIndex"; value: 1 }
317+ PropertyAction { target: floatingFlickable; property: "contentX"; value: 0 }
313318 },
314319 Transition {
315320 from: "spread"
@@ -319,7 +324,12 @@ AbstractStage {
319324 item.playFocusAnimation();
320325 }
321326 }
327+ },
328+ Transition {
329+ to: "stagedrightedge"
330+ PropertyAction { target: floatingFlickable; property: "contentX"; value: 0 }
322331 }
332+
323333 ]
324334 onStateChanged: print("spread going to state:", state)
325335
@@ -1136,7 +1146,7 @@ AbstractStage {
11361146 }
11371147 }
11381148 onContainsMouseChanged: {
1139− if (containsMouse) spreadItem.highlightedIndex = index
1149+ if (containsMouse && !pressed) spreadItem.highlightedIndex = index
11401150 }
11411151 onClose: {
11421152 priv.closingIndex = index
qml/Stages/Spread/DragToCloseArea.qml+1
@@ -7,6 +7,7 @@ DraggingArea {
77 onPressed: mouse.accepted = true;
88 hoverEnabled: true
99
10+
1011 property bool closeable: true
1112
1213 property bool moving: false