git.iko.soy/unity8
on xenial help sign in
fix screen sizes in mocks
commit83d36b3118c57e4cfec996f6d3c6b474d35ef67b authorMichael Zanetti <michael.zanetti@canonical.com> dateFri 17 Mar 2017, 10:31 (10 years ago) parent0bcac19
3 files changed+14−5
compare with xenial
unifiedsplit
qml/Stage/Spread/WorkspacePreview.qml+2 qml/Stage/Spread/Workspaces.qml+5−3 tests/mocks/WindowManager/MockScreens.cpp+7−2
qml/Stage/Spread/WorkspacePreview.qml+2
@@ -12,6 +12,8 @@ Item {
1212 property string background
1313 property int screenHeight
1414
15+ onScreenHeightChanged: print("screen height changed", screenHeight)
16+
1517 property real previewScale: previewSpace.height / previewSpace.screenHeight
1618
1719 property bool containsDragLeft: false
qml/Stage/Spread/Workspaces.qml+5−3
@@ -104,8 +104,9 @@ Item {
104104 leftMargin: itemWidth
105105 rightMargin: itemWidth
106106
107− property var screenSize: screen.availableModes[screen.currentModeIndex].size
108− property int itemWidth: height * screenSize.width / screenSize.height
107+ property int screenWidth: screen.availableModes[screen.currentModeIndex].size.width
108+ property int screenHeight: screen.availableModes[screen.currentModeIndex].size.height
109+ property int itemWidth: height * screenWidth / screenHeight
109110 property int foldingAreaWidth: itemWidth / 2
110111 property int maxAngle: 40
111112
@@ -234,10 +235,11 @@ Item {
234235 ]
235236
236237 WorkspacePreview {
238+ id: workspacePreview
237239 height: listView.height
238240 width: listView.itemWidth
239241 background: root.background
240− screenHeight: screen.availableModes[screen.currentModeIndex].size.height
242+ screenHeight: listView.screenHeight
241243 containsDragLeft: listView.hoveredWorkspaceIndex == index && listView.hoveredHalf == "left"
242244 containsDragRight: listView.hoveredWorkspaceIndex == index && listView.hoveredHalf == "right"
243245 isActive: model.workspace.active
tests/mocks/WindowManager/MockScreens.cpp+7−2
@@ -52,18 +52,23 @@ public:
5252
5353 if (m_connectedWindow) {
5454 disconnect(m_connectedWindow.data());
55− m_sizes.takeFirst()->deleteLater();
5655 }
5756
5857 m_connectedWindow = w;
5958
6059 if (w) {
6160 connect(w, &ScreenWindow::heightChanged, this, [this](int height) {
61+ if (height == 0 || height == m_sizes.first()->size.rheight()) {
62+ return;
63+ }
6264 m_sizes.first()->size.rheight() = height;
6365 Q_EMIT availableModesChanged();
6466
6567 });
6668 connect(w, &ScreenWindow::widthChanged, this, [this](int width) {
69+ if (width == 0 || width == m_sizes.first()->size.rwidth()) {
70+ return;
71+ }
6772 m_sizes.first()->size.rwidth() = width;
6873 Q_EMIT availableModesChanged();
6974 });
@@ -162,7 +167,7 @@ MockScreens::MockScreens()
162167 screen->m_active = i == 0;
163168 screen->m_name = QString("Monitor %1").arg(i);
164169 screen->m_position = QPoint(lastPoint.x(), lastPoint.y());
165− screen->m_currentModeIndex = 3;
170+ screen->m_currentModeIndex = 0;
166171 m_mocks.append(screen);
167172
168173 lastPoint.rx() += screen->m_sizes[screen->m_currentModeIndex]->size.width();