on xenial help sign in
bye bye orange line
commit3bd082f5aa194e2d51e5b9f1f04810654454e2ab authorLukáš Tinkl <lukas.tinkl@canonical.com> dateThu 5 Nov 2015, 13:56 (11 years ago) parentb5ff999
3 files changed+22−29
qml/Panel/Handle.qml+1−1 qml/Panel/IndicatorsMenu.qml+9 qml/Panel/Panel.qml+12−28
qml/Panel/Handle.qml+1−1
@@ -35,7 +35,7 @@ Rectangle {
3535 id: dot
3636 width: units.dp(3)
3737 height: width
38− color: handle.active ? "#de4814" : "#717171"
38+ color: handle.active ? UbuntuColors.orange : "#717171"
3939 radius: units.dp(1)
4040 }
4141 }
qml/Panel/IndicatorsMenu.qml+9
@@ -116,6 +116,15 @@ Showable {
116116 }
117117 }
118118
119+ PanelSeparatorLine {
120+ id: indicatorOrangeLine
121+ anchors {
122+ bottom: handle.top
123+ left: handle.left
124+ right: handle.right
125+ }
126+ }
127+
119128 Rectangle {
120129 anchors.fill: bar
121130 color: panelColor
qml/Panel/Panel.qml+12−28
@@ -77,6 +77,16 @@ Item {
7777 source: "graphics/rectangular_dropshadow.sci"
7878 }
7979
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+
8090 Rectangle {
8191 id: indicatorAreaBackground
8292 color: callHint.visible ? "green" : "#333333"
@@ -90,19 +100,6 @@ Item {
90100 Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration } }
91101 }
92102
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−
106103 Image {
107104 anchors {
108105 top: indicators.top
@@ -159,7 +156,7 @@ Item {
159156 width: root.width - (windowControlButtons.visible ? windowControlButtons.width + titleLabel.width : 0)
160157 minimizedPanelHeight: units.gu(3)
161158 expandedPanelHeight: units.gu(7)
162− openedHeight: root.height - indicatorOrangeLine.height
159+ openedHeight: root.height
163160
164161 overFlowWidth: {
165162 if (callHint.visible) {
@@ -176,10 +173,6 @@ Item {
176173 callHint.showLiveCall();
177174 }
178175 }
179−
180− hideDragHandle {
181− anchors.bottomMargin: -indicatorOrangeLine.height
182− }
183176 }
184177
185178 Label {
@@ -203,15 +196,6 @@ Item {
203196
204197 // TODO here would the LIM come
205198
206− PanelSeparatorLine {
207− id: indicatorOrangeLine
208− anchors {
209− top: indicators.bottom
210− left: indicators.left
211− right: indicators.right
212− }
213− }
214−
215199 ActiveCallHint {
216200 id: __callHint
217201 anchors {
@@ -226,7 +210,7 @@ Item {
226210 QtObject {
227211 id: d
228212 objectName: "panelPriv"
229− readonly property real indicatorHeight: indicators.minimizedPanelHeight + indicatorOrangeLine.height
213+ readonly property real indicatorHeight: indicators.minimizedPanelHeight
230214 }
231215
232216 states: [