0c2d897 · unity8 · git.iko.soy

git.iko.soy/unity8

Added menu overflow

commit0c2d897a5bdbf661f69e18f23c19fe750b915c69 authorNick Dedekind <nick.dedekind@canonical.com> dateTue 24 Jan 2017, 10:34 (10 years ago) parent0c09339

10 files changed+311−40

compare with xenial

unifiedsplit

plugins/Utils/CMakeLists.txt+1 plugins/Utils/expressionfiltermodel.cpp+49 plugins/Utils/expressionfiltermodel.h+42 plugins/Utils/plugin.cpp+2 qml/ApplicationMenus/MenuBar.qml+154−29 qml/ApplicationMenus/MenuNavigator.qml+24−1 qml/ApplicationMenus/MenuPopup.qml+1−2 tests/mocks/Utils/CMakeLists.txt+1 tests/mocks/Utils/plugin.cpp+2 tests/qmltests/ApplicationMenus/tst_MenuBar.qml+35−8

plugins/Utils/CMakeLists.txt+1

@@ -34,6 +34,7 @@ set(QMLPLUGIN_SRC

3434 deviceconfigparser.cpp

3535 globalfunctions.cpp

3636 URLDispatcher.cpp

37+ expressionfiltermodel.cpp

3738 plugin.cpp

3839 )

3940

plugins/Utils/expressionfiltermodel.cppnew file+49

@@ -0,0 +1,49 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "expressionfiltermodel.h"

18+

19+ExpressionFilterModel::ExpressionFilterModel(QObject *parent)

20+ : UnitySortFilterProxyModelQML(parent)

21+{

22+}

23+

24+QJSValue ExpressionFilterModel::matchExpression() const

25+{

26+ return m_matchExpression;

27+}

28+

29+void ExpressionFilterModel::setMatchExpression(const QJSValue &value)

30+{

31+ m_matchExpression = value;

32+ invalidateFilter();

33+}

34+

35+bool

36+ExpressionFilterModel::filterAcceptsRow(int sourceRow,

37+ const QModelIndex &sourceParent) const

38+{

39+ if (m_matchExpression.isCallable()) {

40+ QJSValueList args;

41+ args << sourceRow;

42+ QJSValue ret = m_matchExpression.call(args);

43+ if (ret.isBool()) {

44+ return ret.toBool();

45+ }

46+ }

47+

48+ return UnitySortFilterProxyModelQML::filterAcceptsRow(sourceRow, sourceParent);

49+}

plugins/Utils/expressionfiltermodel.hnew file+42

@@ -0,0 +1,42 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef EXPRESSIONFILTERMODEL_H

18+#define EXPRESSIONFILTERMODEL_H

19+

20+#include "unitysortfilterproxymodelqml.h"

21+#include <QJSValue>

22+

23+class ExpressionFilterModel : public UnitySortFilterProxyModelQML

24+{

25+ Q_OBJECT

26+ Q_PROPERTY(QJSValue matchExpression READ matchExpression WRITE setMatchExpression NOTIFY matchExpressionChanged)

27+public:

28+ explicit ExpressionFilterModel(QObject *parent = 0);

29+

30+ bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;

31+

32+ QJSValue matchExpression() const;

33+ void setMatchExpression(const QJSValue& value);

34+

35+Q_SIGNALS:

36+ void matchExpressionChanged();

37+

38+private:

39+ mutable QJSValue m_matchExpression;

40+};

41+

42+#endif // EXPRESSIONFILTERMODEL_H

plugins/Utils/plugin.cpp+2

@@ -40,6 +40,7 @@

4040#include "globalfunctions.h"

4141#include "URLDispatcher.h"

4242#include "appdrawerproxymodel.h"

43+#include "expressionfiltermodel.h"

4344

4445static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)

4546{

@@ -84,4 +85,5 @@ void UtilsPlugin::registerTypes(const char *uri)

8485 qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);

8586 qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");

8687 qmlRegisterType<AppDrawerProxyModel>(uri, 0, 1, "AppDrawerProxyModel");

88+ qmlRegisterType<ExpressionFilterModel>(uri, 0, 1, "ExpressionFilterModel");

8789}

qml/ApplicationMenus/MenuBar.qml+154−29

@@ -66,11 +66,6 @@ Item {

6666 onPressed: d.dismissAll()

6767 }

6868

69− Rectangle {

70− anchors.fill: row

71− color: Qt.rgba(1,0,0,0.4)

72− }

73−

7469 Row {

7570 id: row

7671 spacing: units.gu(2)

@@ -82,9 +77,17 @@ Item {

8277 active: !d.currentItem && enableKeyFilter

8378 }

8479

80+ Connections {

81+ target: root.unityMenuModel

82+ onModelReset: d.firstInvisibleIndex = undefined

83+ }

84+

8585 Repeater {

8686 id: rowRepeater

8787

88+ onItemAdded: d.recalcFirstInvisibleIndexAdded(index, item)

89+ onCountChanged: d.recalcFirstInvisibleIndex()

90+

8891 Item {

8992 id: visualItem

9093 objectName: root.objectName + "-item" + __ownIndex

@@ -92,8 +95,8 @@ Item {

9295 readonly property int __ownIndex: index

9396 property Item __popup: null;

9497 property bool popupVisible: __popup && __popup.visible

95− property bool shouldDisplay: x + width + ((index < rowRepeater.count-1) ? units.gu(1) : 0) <

96− (root.overflowWidth - (overflowButton.visible ? overflowButton.width : 0))

98+ property bool shouldDisplay: x + width + ((__ownIndex < rowRepeater.count-1) ? units.gu(2) : 0) <

99+ root.overflowWidth - ((__ownIndex < rowRepeater.count-1) ? overflowButton.width : 0)

97100

98101 implicitWidth: column.implicitWidth

99102 implicitHeight: row.height

@@ -129,6 +132,18 @@ Item {

129132 }

130133 }

131134

135+ onVisibleChanged: {

136+ if (!visible && __popup) dismiss();

137+ }

138+

139+ Component.onCompleted: {

140+ shouldDisplayChanged.connect(function() {

141+ if ((!shouldDisplay && d.firstInvisibleIndex == undefined) || __ownIndex <= d.firstInvisibleIndex) {

142+ d.recalcFirstInvisibleIndex();

143+ }

144+ });

145+ }

146+

132147 Connections {

133148 target: d

134149 onDismissAll: visualItem.dismiss()

@@ -167,6 +182,7 @@ Item {

167182 height: _title.height

168183

169184 action: Action {

185+ enabled: visualItem.enabled

170186 // FIXME - SDK Action:text modifies menu text with html underline for mnemonic

171187 text: model.label.replace("_", "&").replace("<u>", "&").replace("</u>", "")

172188

@@ -187,23 +203,6 @@ Item {

187203 } // Repeater

188204 } // Row

189205

190− MouseArea {

191− id: overflowButton

192− visible: root.implicitWidth > root.width

193− height: parent.height

194− width: units.gu(4)

195− anchors.right: parent.right

196−

197− Icon {

198− id: icon

199− width: units.gu(2)

200− height: units.gu(2)

201− anchors.centerIn: parent

202− color: theme.palette.normal.overlayText

203− name: "toolkit_chevron-down_2gu"

204− }

205− }

206−

207206 MouseArea {

208207 anchors.fill: parent

209208 hoverEnabled: d.currentItem

@@ -226,12 +225,109 @@ Item {

226225 if (!d.hoveredItem || !d.currentItem || !d.hoveredItem.contains(Qt.point(pos.x - d.currentItem.x, pos.y - d.currentItem.y))) {

227226 d.hoveredItem = row.childAt(pos.x, pos.y);

228227 if (!d.hoveredItem || !d.hoveredItem.enabled)

229− return false;

228+ return;

230229 if (d.currentItem != d.hoveredItem) {

231230 d.currentItem = d.hoveredItem;

232231 }

233232 }

234− return true;

233+ }

234+ }

235+

236+ MouseArea {

237+ id: overflowButton

238+ objectName: "overflow"

239+

240+ hoverEnabled: d.currentItem

241+ onEntered: d.currentItem = this

242+ onPositionChanged: d.currentItem = this

243+ onClicked: d.currentItem = this

244+

245+ property Item __popup: null;

246+ property bool popupVisible: __popup && __popup.visible

247+ property Item firstInvisibleItem: d.firstInvisibleIndex !== undefined ? rowRepeater.itemAt(d.firstInvisibleIndex) : null

248+

249+ visible: d.firstInvisibleIndex != undefined

250+ x: firstInvisibleItem ? firstInvisibleItem.x : 0

251+

252+ height: parent.height

253+ width: units.gu(4)

254+

255+ onVisibleChanged: {

256+ if (!visible && __popup) dismiss();

257+ }

258+

259+ Icon {

260+ id: icon

261+ width: units.gu(2)

262+ height: units.gu(2)

263+ anchors.centerIn: parent

264+ color: theme.palette.normal.overlayText

265+ name: "toolkit_chevron-down_2gu"

266+ }

267+

268+ function show() {

269+ if (!__popup) {

270+ __popup = overflowComponent.createObject(root, { objectName: overflowButton.objectName + "-menu" });

271+ // force the current item to be the newly popped up menu

272+ } else {

273+ __popup.show();

274+ }

275+ d.currentItem = overflowButton;

276+ }

277+ function hide() {

278+ if (__popup) {

279+ __popup.hide();

280+

281+ if (d.currentItem === overflowButton) {

282+ d.currentItem = null;

283+ }

284+ }

285+ }

286+ function dismiss() {

287+ if (__popup) {

288+ __popup.destroy();

289+ __popup = null;

290+

291+ if (d.currentItem === overflowButton) {

292+ d.currentItem = null;

293+ }

294+ }

295+ }

296+

297+ Connections {

298+ target: d

299+ onDismissAll: overflowButton.dismiss()

300+ }

301+

302+ Component {

303+ id: overflowComponent

304+ MenuPopup {

305+ id: overflowPopup

306+ x: overflowButton.x - units.gu(1)

307+ anchors.top: parent.bottom

308+ unityMenuModel: overflowModel

309+

310+ ExpressionFilterModel {

311+ id: overflowModel

312+ sourceModel: root.unityMenuModel

313+ matchExpression: function(index) {

314+ if (d.firstInvisibleIndex === undefined) return false;

315+ return index >= d.firstInvisibleIndex;

316+ }

317+

318+ function submenu(index) {

319+ return sourceModel.submenu(mapRowToSource(index));

320+ }

321+ function activate(index) {

322+ return sourceModel.activate(mapRowToSource(index));

323+ }

324+ }

325+

326+ Connections {

327+ target: d

328+ onFirstInvisibleIndexChanged: overflowModel.invalidate()

329+ }

330+ }

235331 }

236332 }

237333

@@ -251,18 +347,43 @@ Item {

251347 id: d

252348 objectName: "d"

253349 itemView: rowRepeater

350+ hasOverflow: overflowButton.visible

254351

255352 property Item currentItem: null

256353 property Item hoveredItem: null

257354 property Item prevCurrentItem: null

258−

259− readonly property int currentIndex: currentItem ? currentItem.__ownIndex : -1

260−

261355 property bool altPressed: false

262356 property bool longAltPressed: false

357+ property var firstInvisibleIndex: undefined

358+

359+ readonly property int currentIndex: currentItem && currentItem.hasOwnProperty("__ownIndex") ? currentItem.__ownIndex : -1

263360

264361 signal dismissAll()

265362

363+ function recalcFirstInvisibleIndexAdded(index, item) {

364+ if (firstInvisibleIndex === undefined) {

365+ if (!item.shouldDisplay) {

366+ firstInvisibleIndex = index;

367+ }

368+ } else if (index <= firstInvisibleIndex) {

369+ if (!item.shouldDisplay) {

370+ firstInvisibleIndex = index;

371+ } else {

372+ firstInvisibleIndex++;

373+ }

374+ }

375+ }

376+

377+ function recalcFirstInvisibleIndex() {

378+ for (var i = 0; i < rowRepeater.count; i++) {

379+ if (!rowRepeater.itemAt(i).shouldDisplay) {

380+ firstInvisibleIndex = i;

381+ return;

382+ }

383+ }

384+ firstInvisibleIndex = undefined;

385+ }

386+

266387 onSelect: {

267388 var delegate = rowRepeater.itemAt(index);

268389 if (delegate) {

@@ -270,6 +391,10 @@ Item {

270391 }

271392 }

272393

394+ onOverflow: {

395+ d.currentItem = overflowButton;

396+ }

397+

273398 onCurrentItemChanged: {

274399 if (prevCurrentItem && prevCurrentItem != currentItem) {

275400 if (currentItem) {

qml/ApplicationMenus/MenuNavigator.qml+24−1

@@ -18,8 +18,10 @@ import QtQuick 2.4

1818

1919QtObject {

2020 property Item itemView: null

21+ property bool hasOverflow: false

2122

2223 signal select(int index)

24+ signal overflow()

2325

2426 function selectNext(currentIndex) {

2527 var menu;

@@ -32,6 +34,11 @@ QtObject {

3234 break;

3335 }

3436 newIndex++;

37+

38+ if (hasOverflow && newIndex === itemView.count) {

39+ overflow()

40+ break;

41+ }

3542 }

3643 } else if (currentIndex !== -1 && itemView.count > 1) {

3744 var startIndex = (currentIndex + 1) % itemView.count;

@@ -42,6 +49,12 @@ QtObject {

4249 select(newIndex);

4350 break;

4451 }

52+

53+ if (hasOverflow && newIndex + 1 === itemView.count) {

54+ overflow()

55+ break;

56+ }

57+

4558 newIndex = (newIndex + 1) % itemView.count;

4659 } while (newIndex !== startIndex)

4760 }

@@ -58,12 +71,21 @@ QtObject {

5871 break;

5972 }

6073 newIndex--;

74+

75+ if (hasOverflow && newIndex < 0 ) {

76+ overflow();

77+ break;

78+ }

6179 }

6280 } else if (currentIndex !== -1 && itemView.count > 1) {

6381 var startIndex = currentIndex - 1;

6482 newIndex = startIndex;

65− do {

83+ do {

6684 if (newIndex < 0) {

85+ if (hasOverflow) {

86+ overflow();

87+ break;

88+ }

6789 newIndex = itemView.count - 1;

6890 }

6991 menu = itemView.itemAt(newIndex);

@@ -72,6 +94,7 @@ QtObject {

7294 break;

7395 }

7496 newIndex--;

97+

7598 } while (newIndex !== startIndex)

7699 }

77100 }

qml/ApplicationMenus/MenuPopup.qml+1−2

@@ -203,10 +203,9 @@ UbuntuShape {

203203 !d.hoveredItem.contains(Qt.point(pos.x - d.currentItem.x, pos.y - d.currentItem.y))) {

204204 d.hoveredItem = menuColumn.childAt(pos.x, pos.y)

205205 if (!d.hoveredItem || !d.hoveredItem.enabled)

206− return false;

206+ return;

207207 d.currentItem = d.hoveredItem;

208208 }

209− return true;

210209 }

211210 }

212211

tests/mocks/Utils/CMakeLists.txt+1

@@ -25,6 +25,7 @@ set(QMLPLUGIN_SRC

2525 ${CMAKE_SOURCE_DIR}/plugins/Utils/deviceconfigparser.cpp

2626 ${CMAKE_SOURCE_DIR}/plugins/Utils/globalfunctions.cpp

2727 ${CMAKE_SOURCE_DIR}/plugins/Utils/appdrawerproxymodel.cpp

28+ ${CMAKE_SOURCE_DIR}/plugins/Utils/expressionfiltermodel.cpp

2829 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h

2930 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h

3031 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h

tests/mocks/Utils/plugin.cpp+2

@@ -41,6 +41,7 @@

4141#include <deviceconfigparser.h>

4242#include <globalfunctions.h>

4343#include <appdrawerproxymodel.h>

44+#include <expressionfiltermodel.h>

4445

4546static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)

4647{

@@ -84,4 +85,5 @@ void FakeUtilsPlugin::registerTypes(const char *uri)

8485 qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);

8586 qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");

8687 qmlRegisterType<AppDrawerProxyModel>(uri, 0, 1, "AppDrawerProxyModel");

88+ qmlRegisterType<ExpressionFilterModel>(uri, 0, 1, "ExpressionFilterModel");

8789}

tests/qmltests/ApplicationMenus/tst_MenuBar.qml+35−8

@@ -28,8 +28,8 @@ import ".."

2828

2929Item {

3030 id: root

31− width: units.gu(100)

32− height: units.gu(50)

31+ width: units.gu(120)

32+ height: units.gu(70)

3333

3434 Component.onCompleted: {

3535 QuickUtils.keyboardAttached = true;

@@ -51,11 +51,11 @@ Item {

5151 Rectangle {

5252 anchors {

5353 left: parent.left

54− right: parent.right

5554 top: parent.top

5655 margins: units.gu(1)

5756 }

5857 height: units.gu(3)

58+ width: parent.width * 2/3

5959 color: "grey"

6060

6161 MenuBar {

@@ -65,7 +65,7 @@ Item {

6565

6666 unityMenuModel: UnityMenuModel {

6767 id: menuBackend

68− modelData: appMenuData.generateTestData(17,5,2,3)

68+ modelData: appMenuData.generateTestData(10,5,2,3)

6969 }

7070 }

7171 }

@@ -83,12 +83,12 @@ Item {

8383

8484 function init() {

8585 menuBar.dismiss();

86− menuBackend.modelData = appMenuData.generateTestData(5,5,2,3)

86+ menuBackend.modelData = appMenuData.generateTestData(5,5,2,3, "menu")

8787 activatedSpy.clear();

8888 }

8989

9090 function test_mouseNavigation() {

91− menuBackend.modelData = appMenuData.generateTestData(3,3,0,0);

91+ menuBackend.modelData = appMenuData.generateTestData(3,3,0,0, "menu");

9292 wait(50) // wait for row to build

9393 var priv = findInvisibleChild(menuBar, "d");

9494

@@ -114,7 +114,7 @@ Item {

114114 }

115115

116116 function test_keyboardNavigation_RightKeySelectsNextMenuItem(data) {

117− menuBackend.modelData = appMenuData.generateTestData(3,3,0,0);

117+ menuBackend.modelData = appMenuData.generateTestData(3,3,0,0, "menu");

118118 var priv = findInvisibleChild(menuBar, "d");

119119

120120 var menuItem0 = findChild(menuBar, "menuBar-item0"); verify(menuItem0);

@@ -139,7 +139,7 @@ Item {

139139 }

140140

141141 function test_keyboardNavigation_LeftKeySelectsPreviousMenuItem(data) {

142− menuBackend.modelData = appMenuData.generateTestData(3,3,0,0);

142+ menuBackend.modelData = appMenuData.generateTestData(3,3,0,0, "menu");

143143 var priv = findInvisibleChild(menuBar, "d");

144144

145145 var menuItem0 = findChild(menuBar, "menuBar-item0"); verify(menuItem0);

@@ -179,5 +179,32 @@ Item {

179179 keyPress(data.tag, Qt.AltModifier, 100);

180180 tryCompare(priv, "currentItem", menuItem);

181181 }

182+

183+

184+ function test_overfow() {

185+ menuBackend.modelData = appMenuData.generateTestData(5,2,0,0,"menu");

186+

187+ var overflow = findChild(menuBar, "overflow");

188+ compare(overflow.visible, false, "Overflow should not be visible");

189+

190+ var menu = { "rowData": { "label": "Short" } };

191+ tryCompareFunction(function() {

192+ menuBackend.insertRow(0, menu);

193+ wait(1);

194+ if (overflow.visible) {

195+ return true;

196+ }

197+ return false;

198+ }, true);

199+

200+ tryCompareFunction(function() {

201+ menuBackend.removeRow(0);

202+ wait(1);

203+ if (!overflow.visible) {

204+ return true;

205+ }

206+ return false;

207+ }, true);

208+ }

182209 }

183210}