diff --git a/debian/changelog b/debian/changelog index bf4380d..8117edb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gnome-shell-extensions (3.36.1-1kali1) kali-dev; urgency=medium + + * Sync with Debian. Remaining changes: + - apps-menu with multiple levels + + -- Sophie Brun Thu, 16 Apr 2020 18:32:37 +0200 + gnome-shell-extensions (3.36.1-1) unstable; urgency=medium * Team upload diff --git a/debian/patches/apps-menu-with-multiple-levels.patch b/debian/patches/apps-menu-with-multiple-levels.patch index fa72141..09f0e22 100644 --- a/debian/patches/apps-menu-with-multiple-levels.patch +++ b/debian/patches/apps-menu-with-multiple-levels.patch @@ -8,11 +8,9 @@ extensions/apps-menu/extension.js | 166 ++++++++++++++++++++++++++++++-------- 1 file changed, 134 insertions(+), 32 deletions(-) -diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js -index 70383af..1a1a373 100644 --- a/extensions/apps-menu/extension.js +++ b/extensions/apps-menu/extension.js -@@ -97,30 +97,36 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem { +@@ -97,30 +97,36 @@ class ApplicationMenuItem extends PopupM }); var CategoryMenuItem = GObject.registerClass( @@ -62,11 +60,10 @@ } _isNavigatingSubmenu([x, y]) { -@@ -208,11 +214,61 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem { - if (!this.active) +@@ -209,10 +215,60 @@ class CategoryMenuItem extends PopupMenu return; -+ this._button.selectCategory(this._category); + this._button.selectCategory(this._category); + //this._button.scrollToCatButton(this); + } +}); @@ -88,7 +85,7 @@ + } + + activate(event) { - this._button.selectCategory(this._category); ++ this._button.selectCategory(this._category); this._button.scrollToCatButton(this); + super.activate(event); + } @@ -124,7 +121,7 @@ class ApplicationsMenu extends PopupMenu.PopupMenu { constructor(sourceActor, arrowAlignment, arrowSide, button) { super(sourceActor, arrowAlignment, arrowSide); -@@ -412,7 +468,7 @@ class ApplicationsButton extends PanelMenu.Button { +@@ -412,7 +468,7 @@ class ApplicationsButton extends PanelMe _onTreeChanged() { if (this.menu.isOpen) { this._redisplay(); @@ -133,7 +130,7 @@ } else { this.reloadFlag = true; } -@@ -477,7 +533,7 @@ class ApplicationsButton extends PanelMenu.Button { +@@ -477,7 +533,7 @@ class ApplicationsButton extends PanelMe this._redisplay(); this.reloadFlag = false; } @@ -142,7 +139,7 @@ } super._onOpenStateChanged(menu, open); } -@@ -490,13 +546,14 @@ class ApplicationsButton extends PanelMenu.Button { +@@ -490,13 +546,14 @@ class ApplicationsButton extends PanelMe _redisplay() { this.applicationsBox.destroy_all_children(); @@ -159,7 +156,7 @@ while ((nextType = iter.next()) !== GMenu.TreeItemType.INVALID) { if (nextType === GMenu.TreeItemType.ENTRY) { let entry = iter.get_entry(); -@@ -515,8 +572,17 @@ class ApplicationsButton extends PanelMenu.Button { +@@ -515,8 +572,17 @@ class ApplicationsButton extends PanelMe this.applicationsByCategory[categoryId].push('separator'); } else if (nextType === GMenu.TreeItemType.DIRECTORY) { let subdir = iter.get_directory(); @@ -179,7 +176,7 @@ } } } -@@ -537,8 +603,8 @@ class ApplicationsButton extends PanelMenu.Button { +@@ -537,8 +603,8 @@ class ApplicationsButton extends PanelMe } scrollToCatButton(button) { @@ -190,7 +187,7 @@ let currentScrollValue = catsScrollBoxAdj.get_value(); let boxHeight = catsScrollBoxAlloc.y2 - catsScrollBoxAlloc.y1; let buttonAlloc = button.get_allocation_box(); -@@ -554,8 +620,9 @@ class ApplicationsButton extends PanelMenu.Button { +@@ -554,8 +620,9 @@ class ApplicationsButton extends PanelMe _createLayout() { let section = new PopupMenu.PopupMenuSection(); this.menu.addMenuItem(section); @@ -200,31 +197,31 @@ + this.mainBox.actor.vertical = false; + this.leftBox = new PopupMenu.PopupMenuSection(); this.applicationsScrollBox = new St.ScrollView({ - x_fill: true, - y_fill: false, -@@ -570,6 +637,7 @@ class ApplicationsButton extends PanelMenu.Button { + style_class: 'apps-menu vfade', + x_expand: true, +@@ -568,6 +635,7 @@ class ApplicationsButton extends PanelMe vscroll.connect('scroll-stop', () => { this.menu.passEvents = false; }); +/* this.categoriesScrollBox = new St.ScrollView({ - x_fill: true, - y_fill: false, -@@ -586,9 +654,11 @@ class ApplicationsButton extends PanelMenu.Button { - y_fill: true, - y_align: St.Align.START, + style_class: 'vfade', }); +@@ -576,9 +644,10 @@ class ApplicationsButton extends PanelMe + vscroll.connect('scroll-start', () => (this.menu.passEvents = true)); + vscroll.connect('scroll-stop', () => (this.menu.passEvents = false)); + this.leftBox.add_child(this.categoriesScrollBox); +- +*/ - this.applicationsBox = new St.BoxLayout({ vertical: true }); this.applicationsScrollBox.add_actor(this.applicationsBox); +/* this.categoriesBox = new St.BoxLayout({ vertical: true }); this.categoriesScrollBox.add_actor(this.categoriesBox); -@@ -604,19 +674,33 @@ class ApplicationsButton extends PanelMenu.Button { - y_fill: true, - }); +@@ -586,19 +655,33 @@ class ApplicationsButton extends PanelMe + this.mainBox.add_child(this._createVertSeparator()); + this.mainBox.add_child(this.applicationsScrollBox); section.actor.add_actor(this.mainBox); +*/ + this.categoriesBox = new PopupMenuScrollView(); @@ -259,7 +256,7 @@ let iter = root.iter(); let nextType; while ((nextType = iter.next()) !== GMenu.TreeItemType.INVALID) { -@@ -629,10 +713,13 @@ class ApplicationsButton extends PanelMenu.Button { +@@ -611,10 +694,13 @@ class ApplicationsButton extends PanelMe let categoryId = dir.get_menu_id(); this.applicationsByCategory[categoryId] = []; @@ -277,7 +274,7 @@ } } -@@ -641,9 +728,10 @@ class ApplicationsButton extends PanelMenu.Button { +@@ -623,9 +709,10 @@ class ApplicationsButton extends PanelMe let themeContext = St.ThemeContext.get_for_stage(global.stage); let scaleFactor = themeContext.scale_factor; @@ -290,7 +287,7 @@ } selectCategory(dir) { -@@ -658,6 +746,20 @@ class ApplicationsButton extends PanelMenu.Button { +@@ -640,6 +727,20 @@ class ApplicationsButton extends PanelMe this._displayButtons(this._listApplications(dir.get_menu_id())); else this._displayButtons(this._listApplications(null));