on xenial help sign in
some improvements on the highlight
8670a74Michael Zanetti
po/unity8.pot+1−1
@@ -8,7 +8,7 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: unity8\n"
9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: \n"
10"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"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
qml/Stages/DesktopStage.qml+11−1
@@ -307,9 +307,14 @@ AbstractStage {
307 }
307 }
308 ]
308 ]
309 transitions: [
309 transitions: [
310+ Transition {
311+ from: "stagedrightedge"; to: "spread"
312+ PropertyAction { target: spreadItem; property: "highlightedIndex"; value: -1 }
313+ },
310 Transition {
314 Transition {
311 to: "spread"
315 to: "spread"
312 PropertyAction { target: spreadItem; property: "highlightedIndex"; value: 1 }
316 PropertyAction { target: spreadItem; property: "highlightedIndex"; value: 1 }
317+ PropertyAction { target: floatingFlickable; property: "contentX"; value: 0 }
313 },
318 },
314 Transition {
319 Transition {
315 from: "spread"
320 from: "spread"
@@ -319,7 +324,12 @@ AbstractStage {
319 item.playFocusAnimation();
324 item.playFocusAnimation();
320 }
325 }
321 }
326 }
327+ },
328+ Transition {
329+ to: "stagedrightedge"
330+ PropertyAction { target: floatingFlickable; property: "contentX"; value: 0 }
322 }
331 }
332+
323 ]
333 ]
324 onStateChanged: print("spread going to state:", state)
334 onStateChanged: print("spread going to state:", state)
325
335
@@ -1136,7 +1146,7 @@ AbstractStage {
1136 }
1146 }
1137 }
1147 }
1138 onContainsMouseChanged: {
1148 onContainsMouseChanged: {
1139− if (containsMouse) spreadItem.highlightedIndex = index
1149+ if (containsMouse && !pressed) spreadItem.highlightedIndex = index
1140 }
1150 }
1141 onClose: {
1151 onClose: {
1142 priv.closingIndex = index
1152 priv.closingIndex = index
qml/Stages/Spread/DragToCloseArea.qml+1
@@ -7,6 +7,7 @@ DraggingArea {
7 onPressed: mouse.accepted = true;
7 onPressed: mouse.accepted = true;
8 hoverEnabled: true
8 hoverEnabled: true
9
9
10+
10 property bool closeable: true
11 property bool closeable: true
11
12
12 property bool moving: false
13 property bool moving: false