77b7257 · unity8 · git.iko.soy

qml/Stage/Spread/ScreensAndWorkspaces.qml+2−2

@@ -95,6 +95,7 @@ Item {

95 text: "Add workspace"

96 onTriggered: {

97 screen.addWorkspace();

98+ Screens.sync(root.screensProxy)

98 }

99 }

100 }

101 }

@@ -110,8 +111,7 @@ Item {

110 if (screensProxy.count == 0) {

111 if (screensProxy.count == 0) {

111 return Math.min(implicitWidth, root.width - units.gu(8));

112 return Math.min(implicitWidth, root.width - units.gu(8));

112 }

113 }

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))

115 }

116

117 Behavior on width { UbuntuNumberAnimation {} }

qml/Stage/Spread/Spread.qml+1−1

@@ -93,7 +93,7 @@ Item {

93

94 readonly property real spreadTotalWidth: Math.max(2,totalItemCount) * spreadWidth / visibleItemCount

95

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)

97

98 readonly property var curve: BezierCurve {

99 controlPoint2: {'x': 0.19, 'y': 0.00}

qml/Stage/Spread/Workspaces.qml+1−1

@@ -263,7 +263,7 @@ Item {

263 }

264

265 onClicked: {

266− screenWindow.screen.activeWorkspace = fakeDragItem.workspace

266+ screenWindow.screen.currentWorkspace = fakeDragItem.workspace

267 }

268

269 WorkspacePreview {