git.iko.soy/unity8
on xenial help sign in
highlight active workspace
888c73cMichael Zanetti
qml/Stage/Spread/WorkspacePreview.qml+9
compare with xenial
unifiedsplit
@@ -15,6 +15,7 @@ Item {
15 property real previewScale: previewSpace.height / previewSpace.screenHeight
15 property real previewScale: previewSpace.height / previewSpace.screenHeight
16
16
17 property bool containsDrag: false
17 property bool containsDrag: false
18+ property bool isActive: false
18
19
19 Image {
20 Image {
20 source: previewSpace.background
21 source: previewSpace.background
@@ -70,6 +71,14 @@ Item {
70
71
71 }
72 }
72
73
74+ Rectangle {
75+ anchors.fill: parent
76+ border.color: UbuntuColors.ash
77+ border.width: units.gu(.5)
78+ color: "transparent"
79+ visible: previewSpace.isActive
80+ }
81+
73 Rectangle {
82 Rectangle {
74 anchors.fill: parent
83 anchors.fill: parent
75 border.color: UbuntuColors.blue
84 border.color: UbuntuColors.blue
qml/Stage/Spread/Workspaces.qml+1−2
@@ -60,11 +60,9 @@ Item {
60 var surface = drag.source.surface;
60 var surface = drag.source.surface;
61 drag.source.surface = null;
61 drag.source.surface = null;
62 var workspace = listView.model.get(listView.hoveredWorkspaceIndex);
62 var workspace = listView.model.get(listView.hoveredWorkspaceIndex);
63− print("dropping surface", surface, "on workspace", workspace)
64 WorkspaceManager.moveSurfaceToWorkspace(surface, workspace);
63 WorkspaceManager.moveSurfaceToWorkspace(surface, workspace);
65 drop.accept(Qt.MoveAction)
64 drop.accept(Qt.MoveAction)
66 listView.hoveredWorkspaceIndex = -1
65 listView.hoveredWorkspaceIndex = -1
67− root.commitScreenSetup();
68 }
66 }
69 }
67 }
70
68
@@ -198,6 +196,7 @@ Item {
198 background: root.background
196 background: root.background
199 screenHeight: screen.availableModes[screen.currentModeIndex].size.height
197 screenHeight: screen.availableModes[screen.currentModeIndex].size.height
200 containsDrag: listView.hoveredWorkspaceIndex == index
198 containsDrag: listView.hoveredWorkspaceIndex == index
199+ isActive: model.workspace.active
201 }
200 }
202 MouseArea {
201 MouseArea {
203 anchors.fill: parent
202 anchors.fill: parent