git.iko.soy/unity8
on xenial help sign in
visual tweaks/fixes
c8e87c2Nick Dedekind
qml/Panel/IndicatorItem.qml+15−7
compare with xenial
unifiedsplit
@@ -34,9 +34,9 @@ IndicatorDelegate {
34 property bool selected: false
34 property bool selected: false
35 property real iconHeight: units.gu(2)
35 property real iconHeight: units.gu(2)
36 readonly property color color: {
36 readonly property color color: {
37− if (!expanded) return "#CCCCCC";
37+ if (!expanded) return "#ededed";
38 if (!selected) return "#4c4c4c";
38 if (!selected) return "#4c4c4c";
39− return Theme.palette.normal.foregroundText;
39+ return "#ededed";
40 }
40 }
41
41
42 signal clicked()
42 signal clicked()
@@ -78,7 +78,7 @@ IndicatorDelegate {
78 font.family: "Ubuntu"
78 font.family: "Ubuntu"
79 fontSize: "medium"
79 fontSize: "medium"
80 color: root.color
80 color: root.color
81− Behavior on color { ColorAnimation { duration: UbuntuAnimation.SnapDuration } }
81+ Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
82 }
82 }
83
83
84 Item {
84 Item {
@@ -91,6 +91,13 @@ IndicatorDelegate {
91 verticalCenter: parent.verticalCenter
91 verticalCenter: parent.verticalCenter
92 }
92 }
93
93
94+ opacity: {
95+ if (!expanded) return 1.0;
96+ if (!selected) return 0.6;
97+ return 1.0;
98+ }
99+ Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
100+
94 Row {
101 Row {
95 id: iconRow
102 id: iconRow
96 anchors.centerIn: iconsItem
103 anchors.centerIn: iconsItem
@@ -108,7 +115,7 @@ IndicatorDelegate {
108 source: modelData
115 source: modelData
109 sets: ["status", "actions"]
116 sets: ["status", "actions"]
110 color: root.color
117 color: root.color
111− Behavior on color { ColorAnimation{ duration: UbuntuAnimation.SnapDuration } }
118+ Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
112 }
119 }
113 }
120 }
114 }
121 }
@@ -129,7 +136,7 @@ IndicatorDelegate {
129 font.family: "Ubuntu"
136 font.family: "Ubuntu"
130 fontSize: "medium"
137 fontSize: "medium"
131 color: root.color
138 color: root.color
132− Behavior on color { ColorAnimation{ duration: UbuntuAnimation.SnapDuration } }
139+ Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
133 }
140 }
134 }
141 }
135
142
@@ -147,7 +154,7 @@ IndicatorDelegate {
147 horizontalAlignment: Text.AlignHCenter
154 horizontalAlignment: Text.AlignHCenter
148 opacity: 0
155 opacity: 0
149 color: root.color
156 color: root.color
150− Behavior on color { ColorAnimation{ duration: UbuntuAnimation.SnapDuration } }
157+ Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
151 }
158 }
152
159
153 StateGroup {
160 StateGroup {
@@ -223,12 +230,13 @@ IndicatorDelegate {
223 transitions: [
230 transitions: [
224 Transition {
231 Transition {
225 PropertyAction { target: d; property: "useFallbackIcon" }
232 PropertyAction { target: d; property: "useFallbackIcon" }
233+ PropertyAction { target: iconsItem; property: "opacity" }
226 AnchorAnimation {
234 AnchorAnimation {
227 targets: [ mainItems, iconsItem, leftLabelItem, rightLabelItem ]
235 targets: [ mainItems, iconsItem, leftLabelItem, rightLabelItem ]
228 duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing
236 duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing
229 }
237 }
230 PropertyAnimation {
238 PropertyAnimation {
231− targets: [ root, mainItems, iconsItem, leftLabelItem, rightLabelItem, indicatorName ]
239+ targets: [ root, mainItems, leftLabelItem, rightLabelItem, indicatorName ]
232 properties: "width, opacity, anchors.verticalCenterOffset";
240 properties: "width, opacity, anchors.verticalCenterOffset";
233 duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing
241 duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing
234 }
242 }
qml/Panel/IndicatorItemRow.qml+15−14
@@ -173,6 +173,17 @@ Item {
173 id: highlight
173 id: highlight
174 objectName: "highlight"
174 objectName: "highlight"
175
175
176+ anchors.bottom: row.bottom
177+ height: units.dp(2)
178+ color: "#ededed"
179+ visible: root.currentItem !== null
180+ opacity: 0.0
181+
182+ width: currentItem ? currentItem.width : 0
183+ Behavior on width {
184+ UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing }
185+ }
186+
176 // micromovements of the highlight line when user moves the finger across the items while pulling
187 // micromovements of the highlight line when user moves the finger across the items while pulling
177 // the handle downwards.
188 // the handle downwards.
178 property real highlightCenterOffset: {
189 property real highlightCenterOffset: {
@@ -190,7 +201,7 @@ Item {
190
201
191 if (currentItem && currentItem.ownIndex === 0 && distanceFromCenter < 0) {
202 if (currentItem && currentItem.ownIndex === 0 && distanceFromCenter < 0) {
192 return 0;
203 return 0;
193− } else if (currentItem && currentItem.ownIndex == repeater.count-1 & distanceFromCenter > 0) {
204+ } else if (currentItem && currentItem.ownIndex === repeater.count-1 & distanceFromCenter > 0) {
194 return 0;
205 return 0;
195 }
206 }
196
207
@@ -198,24 +209,14 @@ Item {
198 return shiftPercentageOffset * units.gu(1);
209 return shiftPercentageOffset * units.gu(1);
199 }
210 }
200 Behavior on highlightCenterOffset {
211 Behavior on highlightCenterOffset {
201− SmoothedAnimation {duration:UbuntuAnimation.FastDuration; velocity: 50}
212+ SmoothedAnimation { duration:UbuntuAnimation.FastDuration; velocity: 50; easing: UbuntuAnimation.StandardEasin }
202 }
213 }
203
214
204− anchors.bottom: row.bottom
205− height: units.dp(2)
206− width: currentItem ? currentItem.width : 0
207− color: "white"
208− visible: root.currentItem !== null
209− opacity: 0.0
210−
211 property real currentItemX: currentItem ? currentItem.x : 0 // having Behavior
215 property real currentItemX: currentItem ? currentItem.x : 0 // having Behavior
212− Behavior on x {
216+ Behavior on currentItemX {
213 id: currentItemXBehavior
217 id: currentItemXBehavior
214 enabled: !d.firstItemSwitch && expanded
218 enabled: !d.firstItemSwitch && expanded
215− UbuntuNumberAnimation {
216− duration: UbuntuAnimation.FastDuration;
219+ UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing }
217− easing: UbuntuAnimation.StandardEasing
218− }
219 }
220 }
220 x: currentItemX + highlightCenterOffset
221 x: currentItemX + highlightCenterOffset
221 }
222 }
qml/Panel/IndicatorsMenu.qml+6−5
@@ -24,7 +24,7 @@ Showable {
24 property int minimizedPanelHeight: units.gu(3)
24 property int minimizedPanelHeight: units.gu(3)
25 property int expandedPanelHeight: units.gu(7)
25 property int expandedPanelHeight: units.gu(7)
26 property real openedHeight: units.gu(71)
26 property real openedHeight: units.gu(71)
27− readonly property int lockThreshold: openedHeight / 2
27+ readonly property int lockThreshold: openedHeight * (2 / 3)
28 property alias indicatorsModel: bar.indicatorsModel
28 property alias indicatorsModel: bar.indicatorsModel
29 property alias overFlowWidth: bar.overFlowWidth
29 property alias overFlowWidth: bar.overFlowWidth
30 property bool enableHint: true
30 property bool enableHint: true
@@ -45,14 +45,14 @@ Showable {
45 showAnimation: StandardAnimation {
45 showAnimation: StandardAnimation {
46 property: "height"
46 property: "height"
47 to: openedHeight
47 to: openedHeight
48− duration: UbuntuAnimation.SlowDuration
48+ duration: UbuntuAnimation.BriskDuration
49 easing.type: Easing.OutCubic
49 easing.type: Easing.OutCubic
50 }
50 }
51
51
52 hideAnimation: StandardAnimation {
52 hideAnimation: StandardAnimation {
53 property: "height"
53 property: "height"
54 to: minimizedPanelHeight
54 to: minimizedPanelHeight
55− duration: UbuntuAnimation.SlowDuration
55+ duration: UbuntuAnimation.BriskDuration
56 easing.type: Easing.OutCubic
56 easing.type: Easing.OutCubic
57 }
57 }
58
58
@@ -70,6 +70,7 @@ Showable {
70 }
70 }
71 }
71 }
72 }
72 }
73+ clip: root.partiallyOpened
73
74
74 MenuContent {
75 MenuContent {
75 id: content
76 id: content
@@ -78,7 +79,7 @@ Showable {
78 anchors {
79 anchors {
79 left: parent.left
80 left: parent.left
80 right: parent.right
81 right: parent.right
81− bottom: handle.top
82+ top: bar.bottom
82 }
83 }
83 height: openedHeight - bar.height - handle.height
84 height: openedHeight - bar.height - handle.height
84 indicatorsModel: root.indicatorsModel
85 indicatorsModel: root.indicatorsModel
@@ -279,7 +280,7 @@ Showable {
279 if (!d.activeDragHandle.dragging) return false;
280 if (!d.activeDragHandle.dragging) return false;
280
281
281 yVelocityCalculator.trackedPosition = d.activeDragHandle ? d.activeDragHandle.touchSceneY : 0
282 yVelocityCalculator.trackedPosition = d.activeDragHandle ? d.activeDragHandle.touchSceneY : 0
282− return Math.abs(yVelocityCalculator.calculate()) < 0.1;
283+ return Math.abs(yVelocityCalculator.calculate()) < 0.2;
283 }
284 }
284 }
285 }
285 // left scroll bar handling
286 // left scroll bar handling