git.iko.soy/unity8
on xenial help sign in
fix the mock to not be funky with screen sizes at startup
commit117f2d8822d11c5094471f0027c52c153d83be13 authorMichael Zanetti <michael.zanetti@canonical.com> dateFri 17 Mar 2017, 11:39 (10 years ago) parentca7d40d
4 files changed+9−5
compare with xenial
unifiedsplit
qml/Stage/Spread/WorkspacePreview.qml−2 qml/Stage/Spread/Workspaces.qml+7 qml/Stage/Stage.qml+1−1 tests/mocks/WindowManager/MockScreens.cpp+1−2
qml/Stage/Spread/WorkspacePreview.qml−2
@@ -14,8 +14,6 @@ Item {
1414 property string background
1515 property int screenHeight
1616
17− onScreenHeightChanged: print("screen height changed", screenHeight)
18−
1917 property real previewScale: previewSpace.height / previewSpace.screenHeight
2018
2119 property bool containsDragLeft: false
qml/Stage/Spread/Workspaces.qml+7
@@ -104,6 +104,13 @@ Item {
104104 leftMargin: itemWidth
105105 rightMargin: itemWidth
106106
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+
107114 property int screenWidth: screen.availableModes[screen.currentModeIndex].size.width
108115 property int screenHeight: screen.availableModes[screen.currentModeIndex].size.height
109116 property int itemWidth: height * screenWidth / screenHeight
qml/Stage/Stage.qml+1−1
@@ -350,7 +350,7 @@ FocusScope {
350350 readonly property real virtualKeyboardHeight: root.inputMethodRect.height
351351 }
352352
353− Component.onCompleted: {priv.updateMainAndSideStageIndexes(); print("size", root.width, root.height)}
353+ Component.onCompleted: priv.updateMainAndSideStageIndexes()
354354
355355 Connections {
356356 target: panelState
tests/mocks/WindowManager/MockScreens.cpp+1−2
@@ -35,7 +35,7 @@ class MockScreen : public qtmir::Screen
3535public:
3636 MockScreen()
3737 {
38− m_sizes.append(new qtmir::ScreenMode(50, QSize(640,480)));
38+ m_sizes.append(new qtmir::ScreenMode(50, QSize(800,568)));
3939 m_sizes.append(new qtmir::ScreenMode(60, QSize(1280,1024)));
4040 m_sizes.append(new qtmir::ScreenMode(60, QSize(1440,900)));
4141 m_sizes.append(new qtmir::ScreenMode(60, QSize(1920,1080)));
@@ -73,7 +73,6 @@ public:
7373 Q_EMIT availableModesChanged();
7474 });
7575
76− m_sizes.push_front(new qtmir::ScreenMode(50, w->size()));
7776 Q_EMIT availableModesChanged();
7877 }
7978 }