git.iko.soy/unity8
on xenial help sign in
Merge lp:~lukas-kde/unity8/newWindowDecosAndPanel again
commita2eb4f808d5dc91dcfa26a6851759e5ec28579bb authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateThu 26 Nov 2015, 11:28 (11 years ago) parentfef6a0d5795ae9
13 files changed+15−46
compare with xenial
unifiedsplit
qml/Components/ModeSwitchWarningDialog.qml+1−1 qml/Panel/Handle.qml+1−1 qml/Panel/IndicatorItem.qml+3 qml/Panel/Indicators/client/IndicatorsClient.qml+1−1 qml/Panel/IndicatorsMenu.qml+2−11 qml/Panel/MenuContent.qml+1−1 qml/Panel/Panel.qml+1−1 qml/Panel/PanelSeparatorLine.qml−25 qml/Shell.qml+1−1 qml/Stages/WindowDecoration.qml+1−1 tests/qmltests/Stages/tst_PhoneStage.qml+1−1 tests/qmltests/Stages/tst_SurfaceContainer.qml+1−1 tests/qmltests/Stages/tst_TabletStage.qml+1−1
qml/Components/ModeSwitchWarningDialog.qml+1−1
@@ -75,7 +75,7 @@ ShellDialog {
7575 property string notClickedText: i18n.tr("OK, I will reconnect")
7676 property string clickedText: i18n.tr("Reconnect now!")
7777 text: clicked ? clickedText : notClickedText
78− color: "#333333"
78+ color: "#292929"
7979
8080 MouseArea {
8181 anchors.fill: parent
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 ? UbuntuColors.orange : "#717171"
38+ color: handle.active ? UbuntuColors.orange : "#888888"
3939 radius: units.dp(1)
4040 }
4141 }
qml/Panel/IndicatorItem.qml+3
@@ -66,6 +66,7 @@ IndicatorDelegate {
6666 opacity: 1.0
6767 font.family: "Ubuntu"
6868 fontSize: "medium"
69+ font.weight: Font.Light
6970 color: root.color
7071 Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
7172 }
@@ -126,6 +127,7 @@ IndicatorDelegate {
126127 opacity: 1.0
127128 font.family: "Ubuntu"
128129 fontSize: "medium"
130+ font.weight: Font.Light
129131 color: root.color
130132 Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
131133 }
@@ -142,6 +144,7 @@ IndicatorDelegate {
142144
143145 text: title !== "" ? title : identifier
144146 fontSize: "x-small"
147+ font.weight: Font.Light
145148 horizontalAlignment: Text.AlignHCenter
146149 opacity: 0
147150 color: root.color
qml/Panel/Indicators/client/IndicatorsClient.qml+1−1
@@ -22,7 +22,7 @@ import Ubuntu.Components 1.3
2222import Ubuntu.Components.ListItems 1.3 as ListItem
2323
2424Rectangle {
25− color: "#333333"
25+ color: "#292929"
2626 id: root
2727
2828 Component.onCompleted: {
qml/Panel/IndicatorsMenu.qml+2−11
@@ -38,7 +38,7 @@ Showable {
3838 property bool enableHint: true
3939 property bool contentEnabled: true
4040 property bool showOnClick: true
41− property color panelColor: "#333333"
41+ property color panelColor: "#292929"
4242
4343 signal showTapped(point position)
4444
@@ -110,21 +110,12 @@ Showable {
110110 height: units.gu(0.5)
111111 gradient: Gradient {
112112 GradientStop { position: 0.0; color: "transparent" }
113− GradientStop { position: 1.0; color: "#333333" }
113+ GradientStop { position: 1.0; color: "#292929" }
114114 }
115115 opacity: 0.3
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−
128119 Rectangle {
129120 anchors.fill: bar
130121 color: panelColor
qml/Panel/MenuContent.qml+1−1
@@ -27,7 +27,7 @@ Rectangle {
2727
2828 property QtObject indicatorsModel: null
2929 property int currentMenuIndex: -1
30− color: "#333333" // FIXME not in palette yet
30+ color: "#292929" // FIXME not in palette yet
3131
3232 width: units.gu(40)
3333 height: units.gu(42)
qml/Panel/Panel.qml+1−1
@@ -89,7 +89,7 @@ Item {
8989
9090 Rectangle {
9191 id: indicatorAreaBackground
92− color: callHint.visible ? "green" : "#333333"
92+ color: callHint.visible ? "green" : "#292929"
9393 anchors {
9494 top: parent.top
9595 left: parent.left
qml/Panel/PanelSeparatorLine.qmldeleted−25
@@ -1,25 +0,0 @@
1−/*
2− * Copyright (C) 2013 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.4
18−
19−Rectangle {
20− property real saturation: 1.0
21−
22− // orange in HSL
23− color: Qt.hsla(16.0/360.0, saturation * 0.83, 0.47, 1.0)
24− height: units.dp(2)
25−}
qml/Shell.qml+1−1
@@ -269,7 +269,7 @@ Item {
269269 target: applicationsDisplayLoader.item
270270 property: "maximizedAppTopMargin"
271271 // Not just using panel.panelHeight as that changes depending on the focused app.
272− value: panel.indicators.minimizedPanelHeight + units.dp(2) // dp(2) for orange line
272+ value: panel.indicators.minimizedPanelHeight
273273 }
274274 Binding {
275275 target: applicationsDisplayLoader.item
qml/Stages/WindowDecoration.qml+1−1
@@ -67,7 +67,7 @@ MouseArea {
6767 anchors.fill: parent
6868 anchors.bottomMargin: -radius
6969 radius: units.gu(.5)
70− color: "#333333"
70+ color: "#292929"
7171 }
7272
7373 Row {
tests/qmltests/Stages/tst_PhoneStage.qml+1−1
@@ -34,7 +34,7 @@ Item {
3434 anchors { fill: parent; rightMargin: units.gu(30) }
3535 focus: true
3636 dragAreaWidth: units.gu(2)
37− maximizedAppTopMargin: units.gu(3) + units.dp(2)
37+ maximizedAppTopMargin: units.gu(3)
3838 interactive: true
3939 shellOrientation: Qt.PortraitOrientation
4040 orientations: Orientations {}
tests/qmltests/Stages/tst_SurfaceContainer.qml+1−1
@@ -39,7 +39,7 @@ Rectangle {
3939 id: surfaceContainerLoader
4040 anchors {
4141 top: parent.top
42− topMargin: fullscreenCheckbox.checked ? 0 : units.gu(3) + units.dp(2)
42+ topMargin: fullscreenCheckbox.checked ? 0 : units.gu(3)
4343 bottom: parent.bottom
4444 left: parent.left
4545 }
tests/qmltests/Stages/tst_TabletStage.qml+1−1
@@ -50,7 +50,7 @@ Rectangle {
5050 tabletStageLoader.itemDestroyed = true;
5151 }
5252 dragAreaWidth: units.gu(2)
53− maximizedAppTopMargin: units.gu(3) + units.dp(2)
53+ maximizedAppTopMargin: units.gu(3)
5454 interactive: true
5555 shellOrientation: Qt.LandscapeOrientation
5656 nativeWidth: width