e2b3955 · unity8 · git.iko.soy

git.iko.soy/unity8

display id

commite2b39555cb47245ee28cf3bfa2867e753c14a0a4 authorNick Dedekind <nick.dedekind@canonical.com> dateMon 3 Apr 2017, 17:20 (10 years ago) parent0b8de44

3 files changed+4−12

compare with xenial

unifiedsplit

plugins/WindowManager/Screen.cpp−6 plugins/WindowManager/Screen.h−2 tests/mocks/WindowManager/MockScreens.cpp+4−4

plugins/WindowManager/Screen.cpp−6

@@ -52,12 +52,6 @@ void Screen::setCurrentWorkspace2(Workspace *workspace)

5252 workspace->setCurrentOn(this);

5353}

5454

55−qtmir::OutputId Screen::outputId() const

56−{

57− if (!m_wrapped) return qtmir::OutputId(-1);

58− return m_wrapped->outputId();

59−}

60−

6155bool Screen::used() const

6256{

6357 if (!m_wrapped) return false;

plugins/WindowManager/Screen.h−2

@@ -31,8 +31,6 @@ class Screen: public QObject

3131 Q_PROPERTY(WorkspaceModel* workspaces READ workspaces CONSTANT)

3232 Q_PROPERTY(Workspace* currentWorkspace READ currentWorkspace WRITE setCurrentWorkspace2 NOTIFY currentWorkspaceChanged)

3333public:

34− // From qtmir::Screen

35− qtmir::OutputId outputId() const;

3634 bool used() const;

3735 QString name() const;

3836 float scale() const;

tests/mocks/WindowManager/MockScreens.cpp+4−4

@@ -72,7 +72,7 @@ public:

7272 }

7373 }

7474

75− qtmir::OutputId outputId() const override { return m_id; }

75+ miral::DisplayId displayId() const override { return m_id; }

7676 bool used() const override { return m_used; }

7777 QString name() const override { return m_name; }

7878 float scale() const override { return m_scale; }

@@ -106,7 +106,7 @@ public:

106106 qtmir::ScreenConfiguration *beginConfiguration() const override {

107107 auto config = new qtmir::ScreenConfiguration;

108108 config->valid = true;

109− config->id = m_id;

109+ config->id = m_id.output_id;

110110 config->used = m_used;

111111 config->topLeft = m_position;

112112 config->currentModeIndex = m_currentModeIndex;

@@ -127,7 +127,7 @@ public:

127127 }

128128

129129public:

130− qtmir::OutputId m_id{0};

130+ miral::DisplayId m_id;

131131 bool m_active{false};

132132 bool m_used{true};

133133 QString m_name;

@@ -153,7 +153,7 @@ MockScreens::MockScreens()

153153 QPoint lastPoint(0,0);

154154 for (int i = 0; i < screenCount; ++i) {

155155 auto screen = new MockScreen();

156− screen->m_id = qtmir::OutputId{i};

156+ screen->m_id.output_id = miral::OutputId{i};

157157 screen->m_active = i == 0;

158158 screen->m_name = QString("Monitor %1").arg(i);

159159 screen->m_position = QPoint(lastPoint.x(), lastPoint.y());