git.iko.soy/unity8
on xenial help sign in
bye bye orange line
3bd082fLukáš Tinkl
qml/Panel/Handle.qml+1−1
compare with xenial
unifiedsplit
@@ -35,7 +35,7 @@ Rectangle {
35 id: dot
35 id: dot
36 width: units.dp(3)
36 width: units.dp(3)
37 height: width
37 height: width
38− color: handle.active ? "#de4814" : "#717171"
38+ color: handle.active ? UbuntuColors.orange : "#717171"
39 radius: units.dp(1)
39 radius: units.dp(1)
40 }
40 }
41 }
41 }
qml/Panel/IndicatorsMenu.qml+9
@@ -116,6 +116,15 @@ Showable {
116 }
116 }
117 }
117 }
118
118
119+ PanelSeparatorLine {
120+ id: indicatorOrangeLine
121+ anchors {
122+ bottom: handle.top
123+ left: handle.left
124+ right: handle.right
125+ }
126+ }
127+
119 Rectangle {
128 Rectangle {
120 anchors.fill: bar
129 anchors.fill: bar
121 color: panelColor
130 color: panelColor
qml/Panel/Panel.qml+12−28
@@ -77,6 +77,16 @@ Item {
77 source: "graphics/rectangular_dropshadow.sci"
77 source: "graphics/rectangular_dropshadow.sci"
78 }
78 }
79
79
80+ BorderImage {
81+ id: dropShadow2
82+ anchors {
83+ fill: indicatorAreaBackground
84+ bottomMargin: -units.gu(1)
85+ }
86+ visible: true // FIXME only for an unfocused maximized window
87+ source: "graphics/rectangular_dropshadow.sci"
88+ }
89+
80 Rectangle {
90 Rectangle {
81 id: indicatorAreaBackground
91 id: indicatorAreaBackground
82 color: callHint.visible ? "green" : "#333333"
92 color: callHint.visible ? "green" : "#333333"
@@ -90,19 +100,6 @@ Item {
90 Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration } }
100 Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration } }
91 }
101 }
92
102
93− PanelSeparatorLine {
94− id: orangeLine
95− anchors {
96− top: indicatorAreaBackground.bottom
97− left: parent.left
98− right: indicators.left
99− }
100− saturation: 1 - indicators.unitProgress
101−
102− // Don't let input event pass trough
103− MouseArea { anchors.fill: parent }
104− }
105−
106 Image {
103 Image {
107 anchors {
104 anchors {
108 top: indicators.top
105 top: indicators.top
@@ -159,7 +156,7 @@ Item {
159 width: root.width - (windowControlButtons.visible ? windowControlButtons.width + titleLabel.width : 0)
156 width: root.width - (windowControlButtons.visible ? windowControlButtons.width + titleLabel.width : 0)
160 minimizedPanelHeight: units.gu(3)
157 minimizedPanelHeight: units.gu(3)
161 expandedPanelHeight: units.gu(7)
158 expandedPanelHeight: units.gu(7)
162− openedHeight: root.height - indicatorOrangeLine.height
159+ openedHeight: root.height
163
160
164 overFlowWidth: {
161 overFlowWidth: {
165 if (callHint.visible) {
162 if (callHint.visible) {
@@ -176,10 +173,6 @@ Item {
176 callHint.showLiveCall();
173 callHint.showLiveCall();
177 }
174 }
178 }
175 }
179−
180− hideDragHandle {
181− anchors.bottomMargin: -indicatorOrangeLine.height
182− }
183 }
176 }
184
177
185 Label {
178 Label {
@@ -203,15 +196,6 @@ Item {
203
196
204 // TODO here would the LIM come
197 // TODO here would the LIM come
205
198
206− PanelSeparatorLine {
207− id: indicatorOrangeLine
208− anchors {
209− top: indicators.bottom
210− left: indicators.left
211− right: indicators.right
212− }
213− }
214−
215 ActiveCallHint {
199 ActiveCallHint {
216 id: __callHint
200 id: __callHint
217 anchors {
201 anchors {
@@ -226,7 +210,7 @@ Item {
226 QtObject {
210 QtObject {
227 id: d
211 id: d
228 objectName: "panelPriv"
212 objectName: "panelPriv"
229− readonly property real indicatorHeight: indicators.minimizedPanelHeight + indicatorOrangeLine.height
213+ readonly property real indicatorHeight: indicators.minimizedPanelHeight
230 }
214 }
231
215
232 states: [
216 states: [