git.iko.soy/unity8
on xenial help sign in
Added overflow support to application menus.
079549eNick Dedekind
plugins/Utils/CMakeLists.txt+1
compare with xenial
unifiedsplit
@@ -35,6 +35,7 @@ set(QMLPLUGIN_SRC
35 globalfunctions.cpp
35 globalfunctions.cpp
36 URLDispatcher.cpp
36 URLDispatcher.cpp
37 tabfocusfence.cpp
37 tabfocusfence.cpp
38+ expressionfiltermodel.cpp
38 plugin.cpp
39 plugin.cpp
39 )
40 )
40
41
plugins/Utils/expressionfiltermodel.cppnew file+49
@@ -0,0 +1,49 @@
1+/*
2+ * Copyright (C) 2017 Canonical, Ltd.
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+/*
2+ * Copyright (C) 2017 Canonical, Ltd.
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
@@ -41,6 +41,7 @@
41#include "URLDispatcher.h"
41#include "URLDispatcher.h"
42#include "appdrawerproxymodel.h"
42#include "appdrawerproxymodel.h"
43#include "tabfocusfence.h"
43#include "tabfocusfence.h"
44+#include "expressionfiltermodel.h"
44
45
45static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
46static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
46{
47{
@@ -86,4 +87,5 @@ void UtilsPlugin::registerTypes(const char *uri)
86 qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");
87 qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");
87 qmlRegisterType<AppDrawerProxyModel>(uri, 0, 1, "AppDrawerProxyModel");
88 qmlRegisterType<AppDrawerProxyModel>(uri, 0, 1, "AppDrawerProxyModel");
88 qmlRegisterType<TabFocusFenceItem>(uri, 0, 1, "TabFocusFence");
89 qmlRegisterType<TabFocusFenceItem>(uri, 0, 1, "TabFocusFence");
90+ qmlRegisterType<ExpressionFilterModel>(uri, 0, 1, "ExpressionFilterModel");
89}
91}
qml/ApplicationMenus/MenuBar.qml+277−135
@@ -24,12 +24,13 @@ Item {
24 id: root
24 id: root
25 objectName: "menuBar"
25 objectName: "menuBar"
26
26
27+ // set from outside
27 property alias unityMenuModel: rowRepeater.model
28 property alias unityMenuModel: rowRepeater.model
28−
29− readonly property bool valid: rowRepeater.count > 0
30−
31 property bool enableKeyFilter: false
29 property bool enableKeyFilter: false
30+ property real overflowWidth: width
32
31
32+ // read from outside
33+ readonly property bool valid: rowRepeater.count > 0
33 readonly property bool showRequested: d.longAltPressed || d.currentItem != null
34 readonly property bool showRequested: d.longAltPressed || d.currentItem != null
34
35
35 implicitWidth: row.width
36 implicitWidth: row.width
@@ -75,197 +76,334 @@ Item {
75 acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
76 acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
76 anchors.fill: parent
77 anchors.fill: parent
77 enabled: d.currentItem != null
78 enabled: d.currentItem != null
78− hoverEnabled: enabled && d.currentItem.__popup != null
79+ hoverEnabled: enabled && d.currentItem && d.currentItem.__popup != null
79 onPressed: d.dismissAll()
80 onPressed: d.dismissAll()
80 }
81 }
81
82
82− Item {
83− id: clippingItem
84−
85− height: root.height
86− width: root.width
87− clip: true
88−
89− Row {
83+ Row {
90− id: row
84+ id: row
91− spacing: units.gu(2)
85+ spacing: units.gu(2)
92− height: parent.height
86+ height: parent.height
93
87
94− ActionContext {
88+ ActionContext {
95− id: menuBarContext
89+ id: menuBarContext
96− objectName: "barContext"
90+ objectName: "barContext"
97− active: !d.currentItem && enableKeyFilter
91+ active: !d.currentItem && enableKeyFilter
98− }
92+ }
99−
100− Repeater {
101− id: rowRepeater
102−
103− Item {
104− id: visualItem
105− objectName: root.objectName + "-item" + __ownIndex
106−
107− readonly property int __ownIndex: index
108− property Item __popup: null;
109− property bool popupVisible: __popup && __popup.visible
110
93
111− implicitWidth: column.implicitWidth
94+ Connections {
112− implicitHeight: row.height
95+ target: root.unityMenuModel
113− enabled: model.sensitive
96+ onModelReset: d.firstInvisibleIndex = undefined
97+ }
114
98
99+ Repeater {
100+ id: rowRepeater
101+
102+ onItemAdded: d.recalcFirstInvisibleIndexAdded(index, item)
103+ onCountChanged: d.recalcFirstInvisibleIndex()
104+
105+ Item {
106+ id: visualItem
107+ objectName: root.objectName + "-item" + __ownIndex
108+
109+ readonly property int __ownIndex: index
110+ property Item __popup: null;
111+ readonly property bool popupVisible: __popup && __popup.visible
112+ readonly property bool shouldDisplay: x + width + ((__ownIndex < rowRepeater.count-1) ? units.gu(2) : 0) <
113+ root.overflowWidth - ((__ownIndex < rowRepeater.count-1) ? overflowButton.width : 0)
114+
115+ implicitWidth: column.implicitWidth
116+ implicitHeight: row.height
117+ enabled: model.sensitive && shouldDisplay
118+ opacity: shouldDisplay ? 1 : 0
119+
115− function show() {
120+ function show() {
116− if (!__popup) {
121+ if (!__popup) {
117− __popup = menuComponent.createObject(root, { objectName: visualItem.objectName + "-menu" });
122+ __popup = menuComponent.createObject(root, { objectName: visualItem.objectName + "-menu" });
118− __popup.childActivated.connect(dismiss);
123+ __popup.childActivated.connect(dismiss);
119− // force the current item to be the newly popped up menu
124+ // force the current item to be the newly popped up menu
120− } else {
125+ } else {
121− __popup.show();
126+ __popup.show();
122− }
123− d.currentItem = visualItem;
124 }
127 }
128+ d.currentItem = visualItem;
129+ }
125− function hide() {
130+ function hide() {
126− if (__popup) {
131+ if (__popup) {
127− __popup.hide();
132+ __popup.hide();
128
133
129− if (d.currentItem === visualItem) {
134+ if (d.currentItem === visualItem) {
130− d.currentItem = null;
135+ d.currentItem = null;
131− }
132 }
136 }
133 }
137 }
138+ }
134− function dismiss() {
139+ function dismiss() {
135− if (__popup) {
140+ if (__popup) {
136− __popup.destroy();
141+ __popup.destroy();
137− __popup = null;
142+ __popup = null;
138
143
139− if (d.currentItem === visualItem) {
144+ if (d.currentItem === visualItem) {
140− d.currentItem = null;
145+ d.currentItem = null;
141− }
142 }
146 }
143 }
147 }
148+ }
149+
150+ onVisibleChanged: {
151+ if (!visible && __popup) dismiss();
152+ }
144
153
145− Connections {
154+ onShouldDisplayChanged: {
146− target: d
155+ if ((!shouldDisplay && d.firstInvisibleIndex == undefined) || __ownIndex <= d.firstInvisibleIndex) {
147− onDismissAll: visualItem.dismiss()
156+ d.recalcFirstInvisibleIndex();
148 }
157 }
158+ }
149
159
150− Component {
160+ Connections {
151− id: menuComponent
161+ target: d
152− MenuPopup {
162+ onDismissAll: visualItem.dismiss()
153− desiredX: visualItem.x - units.gu(1)
163+ }
154− desiredY: parent.height
155− unityMenuModel: root.unityMenuModel.submenu(visualItem.__ownIndex)
156
164
165+ Component {
166+ id: menuComponent
167+ MenuPopup {
168+ desiredX: visualItem.x - units.gu(1)
169+ desiredY: parent.height
170+ unityMenuModel: root.unityMenuModel.submenu(visualItem.__ownIndex)
171+
157− Component.onCompleted: reset();
172+ Component.onCompleted: reset();
158− }
159 }
173 }
174+ }
160
175
161− RowLayout {
176+ RowLayout {
162− id: column
177+ id: column
163− spacing: units.gu(1)
178+ spacing: units.gu(1)
164− anchors {
179+ anchors {
165− centerIn: parent
180+ centerIn: parent
166− }
181+ }
167
182
168− Icon {
183+ Icon {
169− Layout.preferredWidth: units.gu(2)
184+ Layout.preferredWidth: units.gu(2)
170− Layout.preferredHeight: units.gu(2)
185+ Layout.preferredHeight: units.gu(2)
171− Layout.alignment: Qt.AlignVCenter
186+ Layout.alignment: Qt.AlignVCenter
172
187
173− visible: model.icon || false
188+ visible: model.icon || false
174− source: model.icon || ""
189+ source: model.icon || ""
175− }
190+ }
176
191
177− ActionItem {
192+ ActionItem {
178− id: actionItem
193+ id: actionItem
179− width: _title.width
194+ width: _title.width
180− height: _title.height
195+ height: _title.height
181
196
182− action: Action {
197+ action: Action {
198+ enabled: visualItem.enabled
183− // FIXME - SDK Action:text modifies menu text with html underline for mnemonic
199+ // FIXME - SDK Action:text modifies menu text with html underline for mnemonic
184− text: model.label.replace("_", "&").replace("<u>", "&").replace("</u>", "")
200+ text: model.label.replace("_", "&").replace("<u>", "&").replace("</u>", "")
185
201
186− onTriggered: {
202+ onTriggered: {
187− visualItem.show();
203+ visualItem.show();
188− }
189 }
204 }
205+ }
190
206
191− Label {
207+ Label {
192− id: _title
208+ id: _title
193− text: actionItem.text
209+ text: actionItem.text
194− horizontalAlignment: Text.AlignLeft
210+ horizontalAlignment: Text.AlignLeft
195− color: enabled ? "white" : "#5d5d5d"
211+ color: enabled ? "white" : "#5d5d5d"
196− }
197 }
212 }
198 }
213 }
214+ }
199− } // Item ( delegate )
215+ } // Item ( delegate )
200− } // Repeater
216+ } // Repeater
201− } // Row
217+ } // Row
202
218
203− MouseArea {
219+ MouseArea {
204− anchors.fill: parent
220+ anchors.fill: parent
205− hoverEnabled: d.currentItem
221+ hoverEnabled: d.currentItem
206
222
207− onEntered: {
223+ onEntered: {
208− if (d.currentItem) {
224+ if (d.currentItem) {
209− updateCurrentItemFromPosition(Qt.point(mouseX, mouseY))
225+ updateCurrentItemFromPosition(Qt.point(mouseX, mouseY))
226+ }
227+ }
228+ onPositionChanged: {
229+ if (d.currentItem) {
230+ updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
231+ }
232+ }
233+ onClicked: {
234+ var prevItem = d.currentItem;
235+ updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
236+ if (prevItem && d.currentItem == prevItem) {
237+ prevItem.hide();
238+ }
239+ }
240+
241+ function updateCurrentItemFromPosition(point) {
242+ var pos = mapToItem(row, point.x, point.y);
243+
244+ if (!d.hoveredItem || !d.currentItem || !d.hoveredItem.contains(Qt.point(pos.x - d.currentItem.x, pos.y - d.currentItem.y))) {
245+ d.hoveredItem = row.childAt(pos.x, pos.y);
246+ if (!d.hoveredItem || !d.hoveredItem.enabled)
247+ return;
248+ if (d.currentItem != d.hoveredItem) {
249+ d.currentItem = d.hoveredItem;
210 }
250 }
211 }
251 }
252+ }
253+ }
254+
255+ MouseArea {
256+ id: overflowButton
257+ objectName: "overflow"
258+
259+ hoverEnabled: d.currentItem
260+ onEntered: d.currentItem = this
212− onPositionChanged: {
261+ onPositionChanged: d.currentItem = this
262+ onClicked: d.currentItem = this
263+
264+ property Item __popup: null;
265+ readonly property bool popupVisible: __popup && __popup.visible
266+ readonly property Item firstInvisibleItem: d.firstInvisibleIndex !== undefined ? rowRepeater.itemAt(d.firstInvisibleIndex) : null
267+
268+ visible: d.firstInvisibleIndex != undefined
269+ x: firstInvisibleItem ? firstInvisibleItem.x : 0
270+
271+ height: parent.height
272+ width: units.gu(4)
273+
274+ onVisibleChanged: {
275+ if (!visible && __popup) dismiss();
276+ }
277+
278+ Icon {
279+ id: icon
280+ width: units.gu(2)
281+ height: units.gu(2)
282+ anchors.centerIn: parent
283+ color: theme.palette.normal.overlayText
284+ name: "toolkit_chevron-down_2gu"
285+ }
286+
287+ function show() {
288+ if (!__popup) {
289+ __popup = overflowComponent.createObject(root, { objectName: overflowButton.objectName + "-menu" });
290+ __popup.childActivated.connect(dismiss);
291+ // force the current item to be the newly popped up menu
292+ } else {
293+ __popup.show();
294+ }
295+ d.currentItem = overflowButton;
296+ }
297+ function hide() {
298+ if (__popup) {
299+ __popup.hide();
300+
213− if (d.currentItem) {
301+ if (d.currentItem === overflowButton) {
214− updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
302+ d.currentItem = null;
215 }
303 }
216 }
304 }
217− onClicked: {
305+ }
218− var prevItem = d.currentItem;
306+ function dismiss() {
219− updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
307+ if (__popup) {
308+ __popup.destroy();
309+ __popup = null;
310+
220− if (prevItem && d.currentItem == prevItem) {
311+ if (d.currentItem === overflowButton) {
221− prevItem.hide();
312+ d.currentItem = null;
222 }
313 }
223 }
314 }
315+ }
224
316
225− function updateCurrentItemFromPosition(point) {
317+ Connections {
226− var pos = mapToItem(row, point.x, point.y);
318+ target: d
319+ onDismissAll: overflowButton.dismiss()
320+ }
321+
322+ Component {
323+ id: overflowComponent
324+ MenuPopup {
325+ id: overflowPopup
326+ desiredX: overflowButton.x - units.gu(1)
327+ desiredY: parent.height
328+ unityMenuModel: overflowModel
329+
330+ ExpressionFilterModel {
331+ id: overflowModel
332+ sourceModel: root.unityMenuModel
333+ matchExpression: function(index) {
334+ if (d.firstInvisibleIndex === undefined) return false;
335+ return index >= d.firstInvisibleIndex;
336+ }
227
337
228− if (!d.hoveredItem || !d.currentItem || !d.hoveredItem.contains(Qt.point(pos.x - d.currentItem.x, pos.y - d.currentItem.y))) {
338+ function submenu(index) {
229− d.hoveredItem = row.childAt(pos.x, pos.y);
339+ return sourceModel.submenu(mapRowToSource(index));
230− if (!d.hoveredItem || !d.hoveredItem.enabled)
231− return false;
232− if (d.currentItem != d.hoveredItem) {
233− d.currentItem = d.hoveredItem;
234 }
340 }
341+ function activate(index) {
342+ return sourceModel.activate(mapRowToSource(index));
343+ }
344+ }
345+
346+ Connections {
347+ target: d
348+ onFirstInvisibleIndexChanged: overflowModel.invalidate()
235 }
349 }
236− return true;
237 }
350 }
238 }
351 }
352+ }
239
353
240− Rectangle {
354+ Rectangle {
241− id: underline
355+ id: underline
242− anchors {
356+ anchors {
243− bottom: row.bottom
357+ bottom: row.bottom
244− }
245− x: d.currentItem ? row.x + d.currentItem.x - units.gu(1) : 0
246− width: d.currentItem ? d.currentItem.width + units.gu(2) : 0
247− height: units.dp(4)
248− color: UbuntuColors.orange
249− visible: d.currentItem
250 }
358 }
359+ x: d.currentItem ? row.x + d.currentItem.x - units.gu(1) : 0
360+ width: d.currentItem ? d.currentItem.width + units.gu(2) : 0
361+ height: units.dp(4)
362+ color: UbuntuColors.orange
363+ visible: d.currentItem
251 }
364 }
252
365
253 MenuNavigator {
366 MenuNavigator {
254 id: d
367 id: d
255 objectName: "d"
368 objectName: "d"
256 itemView: rowRepeater
369 itemView: rowRepeater
370+ hasOverflow: overflowButton.visible
257
371
258 property Item currentItem: null
372 property Item currentItem: null
259 property Item hoveredItem: null
373 property Item hoveredItem: null
260 property Item prevCurrentItem: null
374 property Item prevCurrentItem: null
261−
262− readonly property int currentIndex: currentItem ? currentItem.__ownIndex : -1
263−
264 property bool altPressed: false
375 property bool altPressed: false
265 property bool longAltPressed: false
376 property bool longAltPressed: false
377+ property var firstInvisibleIndex: undefined
378+
379+ readonly property int currentIndex: currentItem && currentItem.hasOwnProperty("__ownIndex") ? currentItem.__ownIndex : -1
266
380
267 signal dismissAll()
381 signal dismissAll()
268
382
383+ function recalcFirstInvisibleIndexAdded(index, item) {
384+ if (firstInvisibleIndex === undefined) {
385+ if (!item.shouldDisplay) {
386+ firstInvisibleIndex = index;
387+ }
388+ } else if (index <= firstInvisibleIndex) {
389+ if (!item.shouldDisplay) {
390+ firstInvisibleIndex = index;
391+ } else {
392+ firstInvisibleIndex++;
393+ }
394+ }
395+ }
396+
397+ function recalcFirstInvisibleIndex() {
398+ for (var i = 0; i < rowRepeater.count; i++) {
399+ if (!rowRepeater.itemAt(i).shouldDisplay) {
400+ firstInvisibleIndex = i;
401+ return;
402+ }
403+ }
404+ firstInvisibleIndex = undefined;
405+ }
406+
269 onSelect: {
407 onSelect: {
270 var delegate = rowRepeater.itemAt(index);
408 var delegate = rowRepeater.itemAt(index);
271 if (delegate) {
409 if (delegate) {
@@ -273,6 +411,10 @@ Item {
273 }
411 }
274 }
412 }
275
413
414+ onOverflow: {
415+ d.currentItem = overflowButton;
416+ }
417+
276 onCurrentItemChanged: {
418 onCurrentItemChanged: {
277 if (prevCurrentItem && prevCurrentItem != currentItem) {
419 if (prevCurrentItem && prevCurrentItem != currentItem) {
278 if (currentItem) {
420 if (currentItem) {
qml/ApplicationMenus/MenuItem.qml+3−1
@@ -46,6 +46,8 @@ ActionItem {
46 enabled: menuData ? menuData.sensitive : false
46 enabled: menuData ? menuData.sensitive : false
47
47
48 action: Action {
48 action: Action {
49+ enabled: root.enabled
50+
49 // FIXME - SDK Action:text modifies menu text with html underline for mnemonic
51 // FIXME - SDK Action:text modifies menu text with html underline for mnemonic
50 text: menuData.label.replace("_", "&").replace("<u>", "&").replace("</u>", "")
52 text: menuData.label.replace("_", "&").replace("<u>", "&").replace("</u>", "")
51 checkable: menuData.isCheck || menuData.isRadio
53 checkable: menuData.isCheck || menuData.isRadio
@@ -137,7 +139,7 @@ ActionItem {
137 theme.palette.disabled.backgroundSecondaryText
139 theme.palette.disabled.backgroundSecondaryText
138
140
139 visible: root.hasSubmenu
141 visible: root.hasSubmenu
140− name: "chevron"
142+ name: "toolkit_chevron-ltr_2gu"
141 }
143 }
142 }
144 }
143}
145}
qml/ApplicationMenus/MenuNavigator.qml+23
@@ -18,8 +18,10 @@ import QtQuick 2.4
18
18
19QtObject {
19QtObject {
20 property Item itemView: null
20 property Item itemView: null
21+ property bool hasOverflow: false
21
22
22 signal select(int index)
23 signal select(int index)
24+ signal overflow()
23
25
24 function selectNext(currentIndex) {
26 function selectNext(currentIndex) {
25 var menu;
27 var menu;
@@ -32,6 +34,11 @@ QtObject {
32 break;
34 break;
33 }
35 }
34 newIndex++;
36 newIndex++;
37+
38+ if (hasOverflow && newIndex === itemView.count) {
39+ overflow()
40+ break;
41+ }
35 }
42 }
36 } else if (currentIndex !== -1 && itemView.count > 1) {
43 } else if (currentIndex !== -1 && itemView.count > 1) {
37 var startIndex = (currentIndex + 1) % itemView.count;
44 var startIndex = (currentIndex + 1) % itemView.count;
@@ -42,6 +49,12 @@ QtObject {
42 select(newIndex);
49 select(newIndex);
43 break;
50 break;
44 }
51 }
52+
53+ if (hasOverflow && newIndex + 1 === itemView.count) {
54+ overflow()
55+ break;
56+ }
57+
45 newIndex = (newIndex + 1) % itemView.count;
58 newIndex = (newIndex + 1) % itemView.count;
46 } while (newIndex !== startIndex)
59 } while (newIndex !== startIndex)
47 }
60 }
@@ -58,12 +71,21 @@ QtObject {
58 break;
71 break;
59 }
72 }
60 newIndex--;
73 newIndex--;
74+
75+ if (hasOverflow && newIndex < 0 ) {
76+ overflow();
77+ break;
78+ }
61 }
79 }
62 } else if (currentIndex !== -1 && itemView.count > 1) {
80 } else if (currentIndex !== -1 && itemView.count > 1) {
63 var startIndex = currentIndex - 1;
81 var startIndex = currentIndex - 1;
64 newIndex = startIndex;
82 newIndex = startIndex;
65 do {
83 do {
66 if (newIndex < 0) {
84 if (newIndex < 0) {
85+ if (hasOverflow) {
86+ overflow();
87+ break;
88+ }
67 newIndex = itemView.count - 1;
89 newIndex = itemView.count - 1;
68 }
90 }
69 menu = itemView.itemAt(newIndex);
91 menu = itemView.itemAt(newIndex);
@@ -72,6 +94,7 @@ QtObject {
72 break;
94 break;
73 }
95 }
74 newIndex--;
96 newIndex--;
97+
75 } while (newIndex !== startIndex)
98 } while (newIndex !== startIndex)
76 }
99 }
77 }
100 }
qml/ApplicationMenus/MenuPopup.qml+26−3
@@ -19,6 +19,7 @@ import QtQuick.Layouts 1.1
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20import Ubuntu.Components.ListItems 1.3 as ListItems
20import Ubuntu.Components.ListItems 1.3 as ListItems
21import "../Components"
21import "../Components"
22+import "../Components/PanelState"
22import "."
23import "."
23
24
24UbuntuShape {
25UbuntuShape {
@@ -100,7 +101,7 @@ UbuntuShape {
100 property real __minimumWidth: units.gu(20)
101 property real __minimumWidth: units.gu(20)
101 property real __maximumWidth: ApplicationMenusLimits.screenWidth * 0.7
102 property real __maximumWidth: ApplicationMenusLimits.screenWidth * 0.7
102 property real __minimumHeight: units.gu(2)
103 property real __minimumHeight: units.gu(2)
103− property real __maximumHeight: ApplicationMenusLimits.screenHeight * 0.7
104+ property real __maximumHeight: ApplicationMenusLimits.screenHeight - PanelState.panelHeight
104
105
105 signal dismissAll()
106 signal dismissAll()
106
107
@@ -183,8 +184,19 @@ UbuntuShape {
183 }
184 }
184
185
185 MouseArea {
186 MouseArea {
187+ id: previousMA
186 anchors.fill: parent
188 anchors.fill: parent
189+ hoverEnabled: enabled
187− onPressed: {
190+ onPressed: progress()
191+
192+ Timer {
193+ running: previousMA.containsMouse && !listView.atYBeginning
194+ interval: 1000
195+ repeat: true
196+ onTriggered: previousMA.progress()
197+ }
198+
199+ function progress() {
188 var item = menuColumn.childAt(0, listView.contentY);
200 var item = menuColumn.childAt(0, listView.contentY);
189 if (item) {
201 if (item) {
190 var previousItem = item;
202 var previousItem = item;
@@ -412,8 +424,19 @@ UbuntuShape {
412 }
424 }
413
425
414 MouseArea {
426 MouseArea {
427+ id: nextMA
415 anchors.fill: parent
428 anchors.fill: parent
429+ hoverEnabled: enabled
416− onPressed: {
430+ onPressed: progress()
431+
432+ Timer {
433+ running: nextMA.containsMouse && !listView.atYEnd
434+ interval: 1000
435+ repeat: true
436+ onTriggered: nextMA.progress()
437+ }
438+
439+ function progress() {
417 var item = menuColumn.childAt(0, listView.contentY + listView.height);
440 var item = menuColumn.childAt(0, listView.contentY + listView.height);
418 if (item) {
441 if (item) {
419 var nextItem = item;
442 var nextItem = item;
qml/Panel/Panel.qml+3−1
@@ -209,6 +209,8 @@ Item {
209 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
209 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
210 active: __applicationMenus.model
210 active: __applicationMenus.model
211
211
212+ width: parent.width - windowControlButtons.width - units.gu(2) - __indicators.barWidth
213+
212 property bool menusRequested: menuBarLoader.item ? menuBarLoader.item.showRequested : false
214 property bool menusRequested: menuBarLoader.item ? menuBarLoader.item.showRequested : false
213
215
214 sourceComponent: MenuBar {
216 sourceComponent: MenuBar {
@@ -385,7 +387,7 @@ Item {
385 }
387 }
386
388
387 enabled: !applicationMenus.expanded
389 enabled: !applicationMenus.expanded
388− opacity: !applicationMenus.expanded ? 1 : 0
390+ opacity: !callHint.visible && !applicationMenus.expanded ? 1 : 0
389 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
391 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
390
392
391 onEnabledChanged: {
393 onEnabledChanged: {
tests/mocks/Utils/CMakeLists.txt+1
@@ -26,6 +26,7 @@ set(QMLPLUGIN_SRC
26 ${CMAKE_SOURCE_DIR}/plugins/Utils/globalfunctions.cpp
26 ${CMAKE_SOURCE_DIR}/plugins/Utils/globalfunctions.cpp
27 ${CMAKE_SOURCE_DIR}/plugins/Utils/appdrawerproxymodel.cpp
27 ${CMAKE_SOURCE_DIR}/plugins/Utils/appdrawerproxymodel.cpp
28 ${CMAKE_SOURCE_DIR}/plugins/Utils/tabfocusfence.cpp
28 ${CMAKE_SOURCE_DIR}/plugins/Utils/tabfocusfence.cpp
29+ ${CMAKE_SOURCE_DIR}/plugins/Utils/expressionfiltermodel.cpp
29 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
30 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
30 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
31 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
31 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h
32 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h
tests/mocks/Utils/plugin.cpp+2
@@ -42,6 +42,7 @@
42#include <globalfunctions.h>
42#include <globalfunctions.h>
43#include <appdrawerproxymodel.h>
43#include <appdrawerproxymodel.h>
44#include <tabfocusfence.h>
44#include <tabfocusfence.h>
45+#include <expressionfiltermodel.h>
45
46
46static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
47static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
47{
48{
@@ -86,4 +87,5 @@ void FakeUtilsPlugin::registerTypes(const char *uri)
86 qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");
87 qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");
87 qmlRegisterType<AppDrawerProxyModel>(uri, 0, 1, "AppDrawerProxyModel");
88 qmlRegisterType<AppDrawerProxyModel>(uri, 0, 1, "AppDrawerProxyModel");
88 qmlRegisterType<TabFocusFenceItem>(uri, 0, 1, "TabFocusFence");
89 qmlRegisterType<TabFocusFenceItem>(uri, 0, 1, "TabFocusFence");
90+ qmlRegisterType<ExpressionFilterModel>(uri, 0, 1, "ExpressionFilterModel");
89}
91}
tests/qmltests/ApplicationMenus/tst_MenuBar.qml+34−8
@@ -28,8 +28,8 @@ import ".."
28
28
29Item {
29Item {
30 id: root
30 id: root
31− width: units.gu(100)
31+ width: units.gu(120)
32− height: units.gu(50)
32+ height: units.gu(70)
33
33
34 Component.onCompleted: {
34 Component.onCompleted: {
35 QuickUtils.keyboardAttached = true;
35 QuickUtils.keyboardAttached = true;
@@ -51,11 +51,11 @@ Item {
51 Rectangle {
51 Rectangle {
52 anchors {
52 anchors {
53 left: parent.left
53 left: parent.left
54− right: parent.right
55 top: parent.top
54 top: parent.top
56 margins: units.gu(1)
55 margins: units.gu(1)
57 }
56 }
58 height: units.gu(3)
57 height: units.gu(3)
58+ width: parent.width * 2/3
59 color: "grey"
59 color: "grey"
60
60
61 MenuBar {
61 MenuBar {
@@ -65,7 +65,7 @@ Item {
65
65
66 unityMenuModel: UnityMenuModel {
66 unityMenuModel: UnityMenuModel {
67 id: menuBackend
67 id: menuBackend
68− modelData: appMenuData.generateTestData(17,5,2,3)
68+ modelData: appMenuData.generateTestData(10,5,2,3)
69 }
69 }
70 }
70 }
71 }
71 }
@@ -83,12 +83,12 @@ Item {
83
83
84 function init() {
84 function init() {
85 menuBar.dismiss();
85 menuBar.dismiss();
86− menuBackend.modelData = appMenuData.generateTestData(5,5,2,3)
86+ menuBackend.modelData = appMenuData.generateTestData(5,5,2,3, "menu")
87 activatedSpy.clear();
87 activatedSpy.clear();
88 }
88 }
89
89
90 function test_mouseNavigation() {
90 function test_mouseNavigation() {
91− menuBackend.modelData = appMenuData.generateTestData(3,3,0,0);
91+ menuBackend.modelData = appMenuData.generateTestData(3,3,0,0, "menu");
92 wait(50) // wait for row to build
92 wait(50) // wait for row to build
93 var priv = findInvisibleChild(menuBar, "d");
93 var priv = findInvisibleChild(menuBar, "d");
94
94
@@ -114,7 +114,7 @@ Item {
114 }
114 }
115
115
116 function test_keyboardNavigation_RightKeySelectsNextMenuItem(data) {
116 function test_keyboardNavigation_RightKeySelectsNextMenuItem(data) {
117− menuBackend.modelData = appMenuData.generateTestData(3,3,0,0);
117+ menuBackend.modelData = appMenuData.generateTestData(3,3,0,0, "menu");
118 var priv = findInvisibleChild(menuBar, "d");
118 var priv = findInvisibleChild(menuBar, "d");
119
119
120 var menuItem0 = findChild(menuBar, "menuBar-item0"); verify(menuItem0);
120 var menuItem0 = findChild(menuBar, "menuBar-item0"); verify(menuItem0);
@@ -139,7 +139,7 @@ Item {
139 }
139 }
140
140
141 function test_keyboardNavigation_LeftKeySelectsPreviousMenuItem(data) {
141 function test_keyboardNavigation_LeftKeySelectsPreviousMenuItem(data) {
142− menuBackend.modelData = appMenuData.generateTestData(3,3,0,0);
142+ menuBackend.modelData = appMenuData.generateTestData(3,3,0,0, "menu");
143 var priv = findInvisibleChild(menuBar, "d");
143 var priv = findInvisibleChild(menuBar, "d");
144
144
145 var menuItem0 = findChild(menuBar, "menuBar-item0"); verify(menuItem0);
145 var menuItem0 = findChild(menuBar, "menuBar-item0"); verify(menuItem0);
@@ -242,5 +242,31 @@ Item {
242 mouseClick(menuItem);
242 mouseClick(menuItem);
243 compare(priv.currentItem, null, "CurrentItem should be null");
243 compare(priv.currentItem, null, "CurrentItem should be null");
244 }
244 }
245+
246+ function test_overfow() {
247+ menuBackend.modelData = appMenuData.generateTestData(5,2,0,0,"menu");
248+
249+ var overflow = findChild(menuBar, "overflow");
250+ compare(overflow.visible, false, "Overflow should not be visible");
251+
252+ var menu = { "rowData": { "label": "Short" } };
253+ tryCompareFunction(function() {
254+ menuBackend.insertRow(0, menu);
255+ wait(1);
256+ if (overflow.visible) {
257+ return true;
258+ }
259+ return false;
260+ }, true);
261+
262+ tryCompareFunction(function() {
263+ menuBackend.removeRow(0);
264+ wait(1);
265+ if (!overflow.visible) {
266+ return true;
267+ }
268+ return false;
269+ }, true);
270+ }
245 }
271 }
246}
272}