117f2d8 · unity8 · git.iko.soy

qml/Stage/Spread/WorkspacePreview.qml−2

compare with xenial

unifiedsplit

@@ -14,8 +14,6 @@ Item {

14 property string background

15 property int screenHeight

16

17− onScreenHeightChanged: print("screen height changed", screenHeight)

18−

19 property real previewScale: previewSpace.height / previewSpace.screenHeight

17 property real previewScale: previewSpace.height / previewSpace.screenHeight

20

18

21 property bool containsDragLeft: false

19 property bool containsDragLeft: false

qml/Stage/Spread/Workspaces.qml+7

@@ -104,6 +104,13 @@ Item {

104 leftMargin: itemWidth

105 rightMargin: itemWidth

106

107+ Connections {

108+ target: screen

109+ onAvailableModesChanged: {

110+ print("blabla", screen.availableModes[screen.currentModeIndex].size.width, screen.availableModes[screen.currentModeIndex].size.height)

111+ }

112+ }

113+

107 property int screenWidth: screen.availableModes[screen.currentModeIndex].size.width

114 property int screenWidth: screen.availableModes[screen.currentModeIndex].size.width

108 property int screenHeight: screen.availableModes[screen.currentModeIndex].size.height

115 property int screenHeight: screen.availableModes[screen.currentModeIndex].size.height

109 property int itemWidth: height * screenWidth / screenHeight

116 property int itemWidth: height * screenWidth / screenHeight

qml/Stage/Stage.qml+1−1

@@ -350,7 +350,7 @@ FocusScope {

350 readonly property real virtualKeyboardHeight: root.inputMethodRect.height

351 }

352

353− Component.onCompleted: {priv.updateMainAndSideStageIndexes(); print("size", root.width, root.height)}

353+ Component.onCompleted: priv.updateMainAndSideStageIndexes()

354

355 Connections {

356 target: panelState

tests/mocks/WindowManager/MockScreens.cpp+1−2

@@ -35,7 +35,7 @@ class MockScreen : public qtmir::Screen

35public:

36 MockScreen()

37 {

38− m_sizes.append(new qtmir::ScreenMode(50, QSize(640,480)));

38+ m_sizes.append(new qtmir::ScreenMode(50, QSize(800,568)));

39 m_sizes.append(new qtmir::ScreenMode(60, QSize(1280,1024)));

40 m_sizes.append(new qtmir::ScreenMode(60, QSize(1440,900)));

41 m_sizes.append(new qtmir::ScreenMode(60, QSize(1920,1080)));

@@ -73,7 +73,6 @@ public:

73 Q_EMIT availableModesChanged();

74 });

75

76− m_sizes.push_front(new qtmir::ScreenMode(50, w->size()));

77 Q_EMIT availableModesChanged();

76 Q_EMIT availableModesChanged();

78 }

77 }

79 }

78 }