git.iko.soy/unity8
on xenial help sign in
Update WindowStateStorage mock
08cbe5eDaniel d'Andrada
tests/mocks/Utils/windowstatestorage.cpp+23
compare with xenial
unifiedsplit
@@ -75,3 +75,26 @@ WindowStateStorage::WindowState WindowStateStorage::getState(const QString &wind
75 if (!m_state.contains(windowId)) return defaultValue;
75 if (!m_state.contains(windowId)) return defaultValue;
76 return m_state.value(windowId);
76 return m_state.value(windowId);
77}
77}
78+
79+Mir::State WindowStateStorage::toMirState(WindowState state) const
80+{
81+ // assumes a single state (not an OR of several)
82+ switch (state) {
83+ case WindowStateMaximized: return Mir::MaximizedState;
84+ case WindowStateMinimized: return Mir::MinimizedState;
85+ case WindowStateFullscreen: return Mir::FullscreenState;
86+ case WindowStateMaximizedLeft: return Mir::MaximizedLeftState;
87+ case WindowStateMaximizedRight: return Mir::MaximizedRightState;
88+ case WindowStateMaximizedHorizontally: return Mir::HorizMaximizedState;
89+ case WindowStateMaximizedVertically: return Mir::VertMaximizedState;
90+ case WindowStateMaximizedTopLeft: return Mir::MaximizedTopLeftState;
91+ case WindowStateMaximizedTopRight: return Mir::MaximizedTopRightState;
92+ case WindowStateMaximizedBottomLeft: return Mir::MaximizedBottomLeftState;
93+ case WindowStateMaximizedBottomRight: return Mir::MaximizedBottomRightState;
94+
95+ case WindowStateNormal:
96+ case WindowStateRestored:
97+ default:
98+ return Mir::RestoredState;
99+ }
100+}
tests/mocks/Utils/windowstatestorage.h+5
@@ -18,6 +18,9 @@
18#include <QVariantMap>
18#include <QVariantMap>
19#include <QRect>
19#include <QRect>
20
20
21+// unity-api
22+#include <unity/shell/application/Mir.h>
23+
21class WindowStateStorage: public QObject
24class WindowStateStorage: public QObject
22{
25{
23 Q_OBJECT
26 Q_OBJECT
@@ -58,6 +61,8 @@ public:
58 // Only in the mock, to easily restore a fresh state
61 // Only in the mock, to easily restore a fresh state
59 Q_INVOKABLE void clear();
62 Q_INVOKABLE void clear();
60
63
64+ Q_INVOKABLE Mir::State toMirState(WindowState state) const;
65+
61Q_SIGNALS:
66Q_SIGNALS:
62 void geometryChanged(const QVariantMap& geometry);
67 void geometryChanged(const QVariantMap& geometry);
63
68