on xenial help sign in
use floatingflickable
commitba4ffbababb2badd66c1f354cfd1cf2478fd6c28 authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 16 Apr 2015, 12:27 (12 years ago) parentfac961c
2 files changed+16−4
qml/Stages/DecoratedWindow.qml+1 qml/Stages/DesktopStage.qml+15−4
qml/Stages/DecoratedWindow.qml+1
@@ -52,6 +52,7 @@ FocusScope {
5252 PropertyChanges {
5353 target: applicationWindow
5454 itemScale: Math.max(root.width / root.windowWidth, root.height / root.windowHeight)
55+ interactive: false
5556 }
5657 PropertyChanges {
5758 target: clipper
qml/Stages/DesktopStage.qml+15−4
@@ -22,6 +22,7 @@ import Ubuntu.Components 1.1
2222import Unity.Application 0.1
2323import "../Components/PanelState"
2424import Utils 0.1
25+import Ubuntu.Gestures 0.1
2526
2627FocusScope {
2728 id: root
@@ -37,8 +38,10 @@ FocusScope {
3738 if (altTabPressed) {
3839 appRepeater.highlightedIndex = Math.min(ApplicationManager.count - 1, 1);
3940 } else {
40− print("focusing app", appRepeater.highlightedIndex)
41− ApplicationManager.requestFocusApplication(ApplicationManager.get(appRepeater.highlightedIndex).appId)
41+ if (root.state == "altTab") {
42+ print("focusing app", appRepeater.highlightedIndex)
43+ ApplicationManager.requestFocusApplication(ApplicationManager.get(appRepeater.highlightedIndex).appId)
44+ }
4245 }
4346 }
4447
@@ -181,6 +184,10 @@ FocusScope {
181184 target: spreadSelectArea
182185 enabled: true
183186 }
187+ PropertyChanges {
188+ target: windowMoveResizeArea
189+ enabled: false
190+ }
184191 }
185192 ]
186193 transitions: [
@@ -205,6 +212,7 @@ FocusScope {
205212 }
206213
207214 WindowMoveResizeArea {
215+ id: windowMoveResizeArea
208216 target: appDelegate
209217 minWidth: appDelegate.minWidth
210218 minHeight: appDelegate.minHeight
@@ -287,13 +295,16 @@ FocusScope {
287295 }
288296 }
289297
290− SpreadFlickable {
298+ FloatingFlickable {
291299 id: spreadFlickable
292300 anchors.fill: parent
293301 contentWidth: Math.max(6, ApplicationManager.count) * Math.min(height / 4, width / 5)
294− visible: false
302+
303+ //visible: false
295304 //boundsBehavior: Flickable.StopAtBounds
296305
306+ onContentXChanged: print("contentXChanged", contentX)
307+
297308 function ensureVisible(index) {
298309
299310 }