9b8104c · unity8 · git.iko.soy

git.iko.soy/unity8

mock the new property

commit9b8104c154cfaa237de469b855b3b0f779316fd9 authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 30 Mar 2016, 13:45 (11 years ago) parent2ac7cdb

2 files changed+40

compare with xenial

unifiedsplit

tests/mocks/GSettings.1.0/fake_gsettings.cpp+31 tests/mocks/GSettings.1.0/fake_gsettings.h+9

tests/mocks/GSettings.1.0/fake_gsettings.cpp+31

@@ -24,6 +24,7 @@ GSettingsControllerQml::GSettingsControllerQml()

2424 : m_usageMode("Staged")

2525 , m_autohideLauncher(false)

2626 , m_launcherWidth(8)

27+ , m_edgeDragWidth(2)

2728{

2829}

2930

@@ -116,6 +117,19 @@ void GSettingsControllerQml::setLauncherWidth(int launcherWidth)

116117 }

117118}

118119

120+uint GSettingsControllerQml::edgeDragWidth() const

121+{

122+ return m_edgeDragWidth;

123+}

124+

125+void GSettingsControllerQml::setEdgeDragWidth(uint edgeDragWidth)

126+{

127+ if (m_edgeDragWidth != edgeDragWidth) {

128+ m_edgeDragWidth = edgeDragWidth;

129+ Q_EMIT edgeDragWidthChanged(edgeDragWidth);

130+ }

131+}

132+

119133GSettingsSchemaQml::GSettingsSchemaQml(QObject *parent): QObject(parent) {

120134}

121135

@@ -161,6 +175,8 @@ GSettingsQml::GSettingsQml(QObject *parent)

161175 this, &GSettingsQml::autohideLauncherChanged);

162176 connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::launcherWidthChanged,

163177 this, &GSettingsQml::launcherWidthChanged);

178+ connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::edgeDragWidthChanged,

179+ this, &GSettingsQml::edgeDragWidthChanged);

164180}

165181

166182GSettingsSchemaQml * GSettingsQml::schema() const {

@@ -242,6 +258,14 @@ int GSettingsQml::launcherWidth() const

242258 }

243259}

244260

261+uint GSettingsQml::edgeDragWidth() const

262+{

263+ if (m_schema->id() == "com.canonical.Unity8") {

264+ return GSettingsControllerQml::instance()->edgeDragWidth();

265+ }

266+ return 0;

267+}

268+

245269void GSettingsQml::setLifecycleExemptAppids(const QStringList &appIds)

246270{

247271 if (m_schema->id() == "com.canonical.qtmir") {

@@ -262,3 +286,10 @@ void GSettingsQml::setLauncherWidth(int launcherWidth)

262286 GSettingsControllerQml::instance()->setLauncherWidth(launcherWidth);

263287 }

264288}

289+

290+void GSettingsQml::setEdgeDragWidth(uint edgeDragWidth)

291+{

292+ if (m_schema->id() == "com.canonical.Unity8") {

293+ GSettingsControllerQml::instance()->setEdgeDragWidth(edgeDragWidth);

294+ }

295+}

tests/mocks/GSettings.1.0/fake_gsettings.h+9

@@ -52,6 +52,7 @@ class GSettingsQml: public QObject

5252 Q_PROPERTY(QStringList lifecycleExemptAppids READ lifecycleExemptAppids WRITE setLifecycleExemptAppids NOTIFY lifecycleExemptAppidsChanged)

5353 Q_PROPERTY(bool autohideLauncher READ autohideLauncher WRITE setAutohideLauncher NOTIFY autohideLauncherChanged)

5454 Q_PROPERTY(int launcherWidth READ launcherWidth WRITE setLauncherWidth NOTIFY launcherWidthChanged)

55+ Q_PROPERTY(uint edgeDragWidth READ edgeDragWidth WRITE setEdgeDragWidth NOTIFY edgeDragWidthChanged)

5556

5657public:

5758 GSettingsQml(QObject *parent = nullptr);

@@ -63,6 +64,7 @@ public:

6364 QStringList lifecycleExemptAppids() const;

6465 bool autohideLauncher() const;

6566 int launcherWidth() const;

67+ uint edgeDragWidth() const;

6668

6769 void setPictureUri(const QString &str);

6870 void setUsageMode(const QString &usageMode);

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

7072 void setLifecycleExemptAppids(const QStringList &appIds);

7173 void setAutohideLauncher(bool autohideLauncher);

7274 void setLauncherWidth(int launcherWidth);

75+ void setEdgeDragWidth(uint edgeDragWidth);

7376

7477Q_SIGNALS:

7578 void schemaChanged();

@@ -79,6 +82,7 @@ Q_SIGNALS:

7982 void lifecycleExemptAppidsChanged(const QStringList &);

8083 void autohideLauncherChanged(bool);

8184 void launcherWidthChanged(int launcherWidth);

85+ void edgeDragWidthChanged(uint edgeDragWidth);

8286

8387private:

8488 GSettingsSchemaQml* m_schema;

@@ -112,6 +116,9 @@ public:

112116 int launcherWidth() const;

113117 Q_INVOKABLE void setLauncherWidth(int launcherWidth);

114118

119+ uint edgeDragWidth() const;

120+ Q_INVOKABLE void setEdgeDragWidth(uint edgeDragWidth);

121+

115122Q_SIGNALS:

116123 void pictureUriChanged(const QString&);

117124 void usageModeChanged(const QString&);

@@ -119,6 +126,7 @@ Q_SIGNALS:

119126 void lifecycleExemptAppidsChanged(const QStringList&);

120127 void autohideLauncherChanged(bool autohideLauncher);

121128 void launcherWidthChanged(int launcherWidth);

129+ void edgeDragWidthChanged(uint edgeDragWidth);

122130

123131private:

124132 GSettingsControllerQml();

@@ -129,6 +137,7 @@ private:

129137 QStringList m_lifecycleExemptAppids;

130138 bool m_autohideLauncher;

131139 int m_launcherWidth;

140+ uint m_edgeDragWidth;

132141

133142 static GSettingsControllerQml* s_controllerInstance;

134143 QList<GSettingsQml *> m_registeredGSettings;