on xenial help sign in
some more fixes
commit77b7257e16d08e092ff4b4a657ba2aa53756647c authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 9 Mar 2017, 16:52 (10 years ago) parent67df091
3 files changed+4−4
qml/Stage/Spread/ScreensAndWorkspaces.qml+2−2 qml/Stage/Spread/Spread.qml+1−1 qml/Stage/Spread/Workspaces.qml+1−1
qml/Stage/Spread/ScreensAndWorkspaces.qml+2−2
@@ -95,6 +95,7 @@ Item {
9595 text: "Add workspace"
9696 onTriggered: {
9797 screen.addWorkspace();
98+ Screens.sync(root.screensProxy)
9899 }
99100 }
100101 }
@@ -110,8 +111,7 @@ Item {
110111 if (screensProxy.count == 0) {
111112 return Math.min(implicitWidth, root.width - units.gu(8));
112113 }
113− // TODO: needs better logic: If this is the active/current screen, make it wide, otherwise narrow
114− return Math.min(implicitWidth, index == 0 ? units.gu(80) : units.gu(40), root.width)
114+ return Math.min(implicitWidth, model.screen.active ? root.width - units.gu(48) : units.gu(40))
115115 }
116116
117117 Behavior on width { UbuntuNumberAnimation {} }
qml/Stage/Spread/Spread.qml+1−1
@@ -93,7 +93,7 @@ Item {
9393
9494 readonly property real spreadTotalWidth: Math.max(2,totalItemCount) * spreadWidth / visibleItemCount
9595
96− readonly property real centeringOffset: Math.max(spreadWidth - spreadTotalWidth + leftStackXPos * 2, 0) / (2 * spreadWidth)
96+ readonly property real centeringOffset: Math.max(spreadWidth - spreadTotalWidth + (leftStackXPos - leftMargin) * 2, 0) / (2 * spreadWidth)
9797
9898 readonly property var curve: BezierCurve {
9999 controlPoint2: {'x': 0.19, 'y': 0.00}
qml/Stage/Spread/Workspaces.qml+1−1
@@ -263,7 +263,7 @@ Item {
263263 }
264264
265265 onClicked: {
266− screenWindow.screen.activeWorkspace = fakeDragItem.workspace
266+ screenWindow.screen.currentWorkspace = fakeDragItem.workspace
267267 }
268268
269269 WorkspacePreview {