git.iko.soy/unity8
on xenial help sign in
checkpoint charlie
897d84dLukáš Tinkl
CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -57,7 +57,7 @@ find_package(Qt5DBus 5.4 REQUIRED)
57find_package(Qt5Concurrent 5.4 REQUIRED)
57find_package(Qt5Concurrent 5.4 REQUIRED)
58find_package(Qt5Sql 5.4 REQUIRED)
58find_package(Qt5Sql 5.4 REQUIRED)
59
59
60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=22)
60+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application>=21)
61pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
61pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
62pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
62pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
63pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
63pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
qml/Stage/DecoratedWindow.qml+1−1
@@ -128,7 +128,7 @@ FocusScope {
128 fill: root
128 fill: root
129 margins: active ? -units.gu(2) : -units.gu(1.5)
129 margins: active ? -units.gu(2) : -units.gu(1.5)
130 }
130 }
131− source: "../graphics/dropshadow2gu@30.sci"
131+ source: "../graphics/dropshadow2gu.sci"
132 opacity: root.shadowOpacity
132 opacity: root.shadowOpacity
133 }
133 }
134
134
qml/Stage/MoveHandler.qml+2−2
@@ -112,8 +112,8 @@ QtObject {
112 // Use integer coordinate values to ensure that target is left in a pixel-aligned
112 // Use integer coordinate values to ensure that target is left in a pixel-aligned
113 // position. Mouse movement could have subpixel precision, yielding a fractional
113 // position. Mouse movement could have subpixel precision, yielding a fractional
114 // mouse position.
114 // mouse position.
115− target.requestedX = Math.round(pos.x - priv.distanceX);
115+ target.windowedX = Math.round(pos.x - priv.distanceX);
116− target.requestedY = Math.round(Math.max(pos.y - priv.distanceY, PanelState.panelHeight));
116+ target.windowedY = Math.round(Math.max(pos.y - priv.distanceY, PanelState.panelHeight));
117
117
118 if (sensingPoints) { // edge/corner detection when dragging via the touch overlay
118 if (sensingPoints) { // edge/corner detection when dragging via the touch overlay
119 if (sensingPoints.topLeft.x < priv.triggerArea && sensingPoints.topLeft.y < PanelState.panelHeight + priv.triggerArea
119 if (sensingPoints.topLeft.x < priv.triggerArea && sensingPoints.topLeft.y < PanelState.panelHeight + priv.triggerArea
qml/Stage/Stage.qml+6−11
@@ -280,11 +280,6 @@ AbstractStage {
280 onCloseClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.close(); } }
280 onCloseClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.close(); } }
281 onMinimizeClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.minimize(); } }
281 onMinimizeClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.minimize(); } }
282 onRestoreClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.restoreFromMaximized(); } }
282 onRestoreClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.restoreFromMaximized(); } }
283− onFocusMaximizedApp: {
284− if (priv.foregroundMaximizedAppDelegate) {
285− priv.foregroundMaximizedAppDelegate.focus = true;
286− }
287− }
288 }
283 }
289
284
290 Binding {
285 Binding {
@@ -579,15 +574,15 @@ AbstractStage {
579 // Do not write to those, they will be set by states
574 // Do not write to those, they will be set by states
580 property real requestedX: windowedX
575 property real requestedX: windowedX
581 property real requestedY: windowedY
576 property real requestedY: windowedY
582− property int requestedWidth: windowedWidth
577+ property real requestedWidth
583− property int requestedHeight: windowedHeight
578+ property real requestedHeight
584
579
585 // In those are for windowed mode. Those values basically store the window's properties
580 // In those are for windowed mode. Those values basically store the window's properties
586 // when having a floating window. If you want to move/resize a window in normal mode, this is what you want to write to.
581 // when having a floating window. If you want to move/resize a window in normal mode, this is what you want to write to.
587− property int windowedX: priv.focusedAppDelegate ? priv.focusedAppDelegate.x + units.gu(3) : (normalZ - 1) * units.gu(3)
582+ property real windowedX: priv.focusedAppDelegate ? priv.focusedAppDelegate.windowedX + units.gu(3) : (normalZ - 1) * units.gu(3)
588− property int windowedY: priv.focusedAppDelegate ? priv.focusedAppDelegate.y + units.gu(3) : normalZ * units.gu(3)
583+ property real windowedY: priv.focusedAppDelegate ? priv.focusedAppDelegate.windowedY + units.gu(3) : normalZ * units.gu(3)
589− property int windowedWidth
584+ property real windowedWidth
590− property int windowedHeight
585+ property real windowedHeight
591
586
592 Binding {
587 Binding {
593 target: appDelegate
588 target: appDelegate
tests/qmltests/CMakeLists.txt+1−1
@@ -92,7 +92,7 @@ add_unity8_qmltest(Stages PhoneStage)
92add_unity8_qmltest(Stages SpreadDelegate)
92add_unity8_qmltest(Stages SpreadDelegate)
93add_unity8_qmltest(Stages SurfaceContainer)
93add_unity8_qmltest(Stages SurfaceContainer)
94add_unity8_qmltest(Stages TabletStage)
94add_unity8_qmltest(Stages TabletStage)
95−add_unity8_qmltest(Stages WindowResizeArea)
95+add_unity8_qmltest(Stage WindowResizeArea)
96add_unity8_qmltest(Stage Splash)
96add_unity8_qmltest(Stage Splash)
97add_unity8_qmltest(Stage DecoratedWindow)
97add_unity8_qmltest(Stage DecoratedWindow)
98add_unity8_qmltest(Tutorial Tutorial)
98add_unity8_qmltest(Tutorial Tutorial)
tests/qmltests/Stage/tst_WindowResizeArea.qml+10−6
@@ -20,7 +20,7 @@ import QtTest 1.0
20import Unity.Test 0.1
20import Unity.Test 0.1
21import ".."
21import ".."
22import "../../../qml/Components/PanelState"
22import "../../../qml/Components/PanelState"
23−import "../../../qml/Stages"
23+import "../../../qml/Stage"
24import Ubuntu.Components 1.3
24import Ubuntu.Components 1.3
25import Ubuntu.Components.ListItems 1.3 as ListItem
25import Ubuntu.Components.ListItems 1.3 as ListItem
26import Unity.Application 0.1
26import Unity.Application 0.1
@@ -34,7 +34,7 @@ Item {
34 Binding {
34 Binding {
35 target: PanelState
35 target: PanelState
36 property: "panelHeight"
36 property: "panelHeight"
37− value: units.gu(2)
37+ value: units.gu(3)
38 }
38 }
39
39
40 Component {
40 Component {
@@ -46,12 +46,16 @@ Item {
46 property alias resizeAreaMinHeight: windowResizeArea.minHeight
46 property alias resizeAreaMinHeight: windowResizeArea.minHeight
47 x: requestedX
47 x: requestedX
48 y: requestedY
48 y: requestedY
49− property real requestedX: units.gu(20)
49+ property real requestedX: windowedX
50− property real requestedY: units.gu(20)
50+ property real requestedY: windowedY
51 width: requestedWidth
51 width: requestedWidth
52 height: requestedHeight
52 height: requestedHeight
53− property real requestedWidth
53+ property real requestedWidth: windowedWidth
54− property real requestedHeight
54+ property real requestedHeight: windowedHeight
55+ property real windowedX: units.gu(20)
56+ property real windowedY: units.gu(20)
57+ property real windowedWidth
58+ property real windowedHeight
55 property real minimumWidth: 0
59 property real minimumWidth: 0
56 property real minimumHeight: 0
60 property real minimumHeight: 0
57 property real maximumWidth: 0
61 property real maximumWidth: 0