863244c · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

make the edge drag area width configurable Fixes: #1559512

863244cMichael Zanetti11 years ago

data/com.canonical.Unity8.gschema.xml+5

compare with xenial

unifiedsplit

@@ -27,6 +27,11 @@

27 <summary>Maximum push needed to overcome edge barrier</summary>

28 <description>How much you have to push (in grid units) the mouse against an edge barrier when sensibility is 1.</description>

29 </key>

30+ <key type="u" name="edge-drag-width">

31+ <default>2</default>

32+ <summary>The width of the edge drag areas</summary>

33+ <description>How big (in grid units) the edge-drag sensitive area should be.</description>

34+ </key>

30 <key type="b" name="autohide-launcher">

35 <key type="b" name="autohide-launcher">

31 <default>true</default>

36 <default>true</default>

32 <summary>Autohide the launcher</summary>

37 <summary>Autohide the launcher</summary>

qml/Shell.qml+1−1

@@ -109,7 +109,7 @@ Item {

109 // the greeter or launcher until we know whether the session is locked.

110 enabled: greeter && !greeter.waiting

111

112− property real edgeSize: units.gu(2)

112+ property real edgeSize: units.gu(settings.edgeDragWidth)

113

114 WallpaperResolver {

115 id: wallpaperResolver

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

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

25 , m_usageMode("Staged")

26 , m_autohideLauncher(false)

27 , m_launcherWidth(8)

28+ , m_edgeDragWidth(2)

28{

29{

29}

30}

@@ -130,6 +131,19 @@ void GSettingsControllerQml::setLauncherWidth(int launcherWidth)

130 }

131 }

131}

132}

132

133

134+uint GSettingsControllerQml::edgeDragWidth() const

135+{

136+ return m_edgeDragWidth;

137+}

138+

139+void GSettingsControllerQml::setEdgeDragWidth(uint edgeDragWidth)

140+{

141+ if (m_edgeDragWidth != edgeDragWidth) {

142+ m_edgeDragWidth = edgeDragWidth;

143+ Q_EMIT edgeDragWidthChanged(edgeDragWidth);

144+ }

145+}

146+

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

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

134}

148}

135

149

@@ -192,6 +206,8 @@ void GSettingsQml::componentComplete()

192 this, &GSettingsQml::autohideLauncherChanged);

206 this, &GSettingsQml::autohideLauncherChanged);

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

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

194 this, &GSettingsQml::launcherWidthChanged);

208 this, &GSettingsQml::launcherWidthChanged);

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

210+ this, &GSettingsQml::edgeDragWidthChanged);

195

211

196 Q_EMIT disableHeightChanged();

212 Q_EMIT disableHeightChanged();

197 Q_EMIT pictureUriChanged();

213 Q_EMIT pictureUriChanged();

@@ -200,6 +216,7 @@ void GSettingsQml::componentComplete()

200 Q_EMIT lifecycleExemptAppidsChanged();

216 Q_EMIT lifecycleExemptAppidsChanged();

201 Q_EMIT autohideLauncherChanged();

217 Q_EMIT autohideLauncherChanged();

202 Q_EMIT launcherWidthChanged();

218 Q_EMIT launcherWidthChanged();

219+ Q_EMIT edgeDragWidthChanged();

203}

220}

204

221

205GSettingsSchemaQml * GSettingsQml::schema() const {

222GSettingsSchemaQml * GSettingsQml::schema() const {

@@ -297,6 +314,15 @@ QVariant GSettingsQml::launcherWidth() const

297 }

314 }

298}

315}

299

316

317+QVariant GSettingsQml::edgeDragWidth() const

318+{

319+ if (m_valid && m_schema->id() == "com.canonical.Unity8") {

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

321+ } else {

322+ return QVariant();

323+ }

324+}

325+

300void GSettingsQml::setLifecycleExemptAppids(const QVariant &appIds)

326void GSettingsQml::setLifecycleExemptAppids(const QVariant &appIds)

301{

327{

302 if (m_valid && m_schema->id() == "com.canonical.qtmir") {

328 if (m_valid && m_schema->id() == "com.canonical.qtmir") {

@@ -317,3 +343,10 @@ void GSettingsQml::setLauncherWidth(const QVariant &launcherWidth)

317 GSettingsControllerQml::instance()->setLauncherWidth(launcherWidth.toInt());

343 GSettingsControllerQml::instance()->setLauncherWidth(launcherWidth.toInt());

318 }

344 }

319}

345}

346+

347+void GSettingsQml::setEdgeDragWidth(const QVariant &edgeDragWidth)

348+{

349+ if (m_valid && m_schema->id() == "com.canonical.Unity8") {

350+ GSettingsControllerQml::instance()->setEdgeDragWidth(edgeDragWidth.toUInt());

351+ }

352+}

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

@@ -56,6 +56,7 @@ class GSettingsQml: public QObject, public QQmlParserStatus

56 Q_PROPERTY(QVariant lifecycleExemptAppids READ lifecycleExemptAppids WRITE setLifecycleExemptAppids NOTIFY lifecycleExemptAppidsChanged)

57 Q_PROPERTY(QVariant autohideLauncher READ autohideLauncher WRITE setAutohideLauncher NOTIFY autohideLauncherChanged)

58 Q_PROPERTY(QVariant launcherWidth READ launcherWidth WRITE setLauncherWidth NOTIFY launcherWidthChanged)

59+ Q_PROPERTY(QVariant edgeDragWidth READ edgeDragWidth WRITE setEdgeDragWidth NOTIFY edgeDragWidthChanged)

60public:

61public:

61 GSettingsQml(QObject *parent = nullptr);

62 GSettingsQml(QObject *parent = nullptr);

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

71 QVariant lifecycleExemptAppids() const;

72 QVariant lifecycleExemptAppids() const;

72 QVariant autohideLauncher() const;

73 QVariant autohideLauncher() const;

73 QVariant launcherWidth() const;

74 QVariant launcherWidth() const;

75+ QVariant edgeDragWidth() const;

75 void setDisableHeight(const QVariant &val);

77 void setDisableHeight(const QVariant &val);

76 void setPictureUri(const QVariant &str);

78 void setPictureUri(const QVariant &str);

@@ -79,6 +81,7 @@ public:

79 void setLifecycleExemptAppids(const QVariant &appIds);

81 void setLifecycleExemptAppids(const QVariant &appIds);

80 void setAutohideLauncher(const QVariant &autohideLauncher);

82 void setAutohideLauncher(const QVariant &autohideLauncher);

81 void setLauncherWidth(const QVariant &launcherWidth);

83 void setLauncherWidth(const QVariant &launcherWidth);

84+ void setEdgeDragWidth(const QVariant &edgeDragWidth);

83Q_SIGNALS:

86Q_SIGNALS:

84 void disableHeightChanged();

87 void disableHeightChanged();

@@ -89,6 +92,7 @@ Q_SIGNALS:

89 void lifecycleExemptAppidsChanged();

92 void lifecycleExemptAppidsChanged();

90 void autohideLauncherChanged();

93 void autohideLauncherChanged();

91 void launcherWidthChanged();

94 void launcherWidthChanged();

95+ void edgeDragWidthChanged();

93private:

97private:

94 GSettingsSchemaQml* m_schema;

98 GSettingsSchemaQml* m_schema;

@@ -126,6 +130,9 @@ public:

126 int launcherWidth() const;

130 int launcherWidth() const;

127 Q_INVOKABLE void setLauncherWidth(int launcherWidth);

131 Q_INVOKABLE void setLauncherWidth(int launcherWidth);

128

132

133+ uint edgeDragWidth() const;

134+ Q_INVOKABLE void setEdgeDragWidth(uint edgeDragWidth);

135+

129Q_SIGNALS:

136Q_SIGNALS:

130 void disableHeightChanged();

137 void disableHeightChanged();

131 void pictureUriChanged(const QString&);

138 void pictureUriChanged(const QString&);

@@ -134,6 +141,7 @@ Q_SIGNALS:

134 void lifecycleExemptAppidsChanged(const QStringList&);

141 void lifecycleExemptAppidsChanged(const QStringList&);

135 void autohideLauncherChanged(bool autohideLauncher);

142 void autohideLauncherChanged(bool autohideLauncher);

136 void launcherWidthChanged(int launcherWidth);

143 void launcherWidthChanged(int launcherWidth);

144+ void edgeDragWidthChanged(uint edgeDragWidth);

137

145

138private:

146private:

139 GSettingsControllerQml();

147 GSettingsControllerQml();

@@ -145,6 +153,7 @@ private:

145 QStringList m_lifecycleExemptAppids;

153 QStringList m_lifecycleExemptAppids;

146 bool m_autohideLauncher;

154 bool m_autohideLauncher;

147 int m_launcherWidth;

155 int m_launcherWidth;

156+ uint m_edgeDragWidth;

148

157

149 static GSettingsControllerQml* s_controllerInstance;

158 static GSettingsControllerQml* s_controllerInstance;

150 QList<GSettingsQml *> m_registeredGSettings;

159 QList<GSettingsQml *> m_registeredGSettings;