c9164f6 · unity8 · git.iko.soy

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

compare with xenial

unifiedsplit

@@ -70,9 +70,10 @@ Item {

70 WorkspaceManager.moveSurfaceToWorkspace(surface, workspace);

71 drop.accept(Qt.MoveAction)

72 if (listView.hoveredHalf == "right") {

73− workspace.activate();

74 root.closeSpread();

73 root.closeSpread();

74+ workspace.activate();

75 }

76+ surface.activate();

76 listView.hoveredWorkspaceIndex = -1

77 listView.hoveredWorkspaceIndex = -1

77 }

78 }

79 }

qml/Stage/Stage.qml+2

@@ -230,6 +230,7 @@ FocusScope {

230 shortcut: Qt.AltModifier|Qt.ControlModifier|Qt.Key_Left

231 active: !workspaceSwitcher.active

232 onTriggered: {

233+ root.focus = true;

233 workspaceSwitcher.showLeft()

234 workspaceSwitcher.showLeft()

234 }

235 }

236 }

@@ -238,6 +239,7 @@ FocusScope {

238 shortcut: Qt.AltModifier|Qt.ControlModifier|Qt.Key_Right

239 shortcut: Qt.AltModifier|Qt.ControlModifier|Qt.Key_Right

239 active: !workspaceSwitcher.active

240 active: !workspaceSwitcher.active

240 onTriggered: {

241 onTriggered: {

242+ root.focus = true;

241 workspaceSwitcher.showRight()

243 workspaceSwitcher.showRight()

242 }

244 }

243 }

245 }

qml/Stage/WorkspaceSwitcher.qml+1

@@ -114,6 +114,7 @@ UbuntuShape {

114 d.ctrlPressed = false;

115 break;

116 }

117+

117 if (!d.altPressed && !d.ctrlPressed) {

118 if (!d.altPressed && !d.ctrlPressed) {

118 print("starting hidetimer")

119 print("starting hidetimer")

119 d.active = false;

120 d.active = false;