Codebase list gnome-shell-extensions / debian/3.14.2-1kali3
Update patch on apps-menu to fix a crash when desktop files are installed. Raphaël Hertzog 8 years ago
2 changed file(s) with 17 addition(s) and 13 deletion(s). Raw diff Collapse all Expand all
0 gnome-shell-extensions (3.14.2-1kali3) kali-dev; urgency=medium
1
2 * Update patch on apps-menu to fix a crash when desktop files are installed.
3
4 -- Raphaël Hertzog <[email protected]> Thu, 21 May 2015 16:06:15 +0200
5
06 gnome-shell-extensions (3.14.2-1kali2) kali-dev; urgency=medium
17
28 * Increase default width of category box to 300 pixels.
146146 this.parent(event);
147147 },
148148
149 @@ -201,12 +313,31 @@ const CategoryMenuItem = new Lang.Class(
149 @@ -201,12 +313,29 @@ const CategoryMenuItem = new Lang.Class(
150150 setActive: function(active, params) {
151151 if (active) {
152152 this._button.selectCategory(this._category, this);
168168 + hscrollbar_policy: Gtk.PolicyType.NEVER,
169169 + vscrollbar_policy: Gtk.PolicyType.AUTOMATIC });
170170 +
171 + this.container = new Shell.GenericContainer();
172 + this.box.add_actor(this.container);
173171 + this.actor.add_actor(this.box);
174172 + this.actor._delegate = this;
175173 + this.actor.clip_to_allocation = true;
179177 const HotCorner = new Lang.Class({
180178 Name: 'HotCorner',
181179 Extends: Layout.HotCorner,
182 @@ -305,7 +436,7 @@ const ApplicationsButton = new Lang.Clas
180 @@ -305,7 +434,7 @@ const ApplicationsButton = new Lang.Clas
183181 _installedChangedId = appSys.connect('installed-changed', Lang.bind(this, function() {
184182 if (this.menu.isOpen) {
185183 this._redisplay();
188186 } else {
189187 this.reloadFlag = true;
190188 }
191 @@ -370,18 +501,19 @@ const ApplicationsButton = new Lang.Clas
189 @@ -370,18 +499,19 @@ const ApplicationsButton = new Lang.Clas
192190 this._redisplay();
193191 this.reloadFlag = false;
194192 }
202200 _redisplay: function() {
203201 this.applicationsBox.destroy_all_children();
204202 - this.categoriesBox.destroy_all_children();
205 + this.categoriesBox.actor.destroy_all_children();
203 + this.categoriesBox.box.destroy_all_children();
206204 this._display();
207205 },
208206
211209 let iter = dir.iter();
212210 let nextType;
213211 while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
214 @@ -391,12 +523,21 @@ const ApplicationsButton = new Lang.Clas
212 @@ -391,12 +521,21 @@ const ApplicationsButton = new Lang.Clas
215213 let app = appSys.lookup_app(entry.get_desktop_file_id());
216214 if (appInfo.should_show()) {
217215 let menu_id = dir.get_menu_id();
236234 }
237235 }
238236 },
239 @@ -417,8 +558,8 @@ const ApplicationsButton = new Lang.Clas
237 @@ -417,8 +556,8 @@ const ApplicationsButton = new Lang.Clas
240238 },
241239
242240 scrollToCatButton: function(button) {
247245 let currentScrollValue = catsScrollBoxAdj.get_value();
248246 let boxHeight = catsScrollBoxAlloc.y2 - catsScrollBoxAlloc.y1;
249247 let buttonAlloc = button.actor.get_allocation_box();
250 @@ -432,10 +573,16 @@ const ApplicationsButton = new Lang.Clas
248 @@ -432,10 +571,16 @@ const ApplicationsButton = new Lang.Clas
251249 },
252250
253251 _createLayout: function() {
266264 this.applicationsScrollBox = new St.ScrollView({ x_fill: true, y_fill: false,
267265 y_align: St.Align.START,
268266 style_class: 'apps-menu vfade' });
269 @@ -447,41 +594,52 @@ const ApplicationsButton = new Lang.Clas
267 @@ -447,41 +592,52 @@ const ApplicationsButton = new Lang.Clas
270268 vscroll.connect('scroll-stop', Lang.bind(this, function() {
271269 this.menu.passEvents = false;
272270 }));
343341
344342 //Load categories
345343 this.applicationsByCategory = {};
346 @@ -489,7 +647,7 @@ const ApplicationsButton = new Lang.Clas
344 @@ -489,7 +645,7 @@ const ApplicationsButton = new Lang.Clas
347345 tree.load_sync();
348346 let root = tree.get_root_directory();
349347 let categoryMenuItem = new CategoryMenuItem(this, null);
352350 let iter = root.iter();
353351 let nextType;
354352 while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
355 @@ -498,10 +656,12 @@ const ApplicationsButton = new Lang.Clas
353 @@ -498,10 +654,12 @@ const ApplicationsButton = new Lang.Clas
356354 if (!dir.get_is_nodisplay()) {
357355 let categoryId = dir.get_menu_id();
358356 this.applicationsByCategory[categoryId] = [];
369367 }
370368 }
371369 }
372 @@ -510,8 +670,9 @@ const ApplicationsButton = new Lang.Clas
370 @@ -510,8 +668,9 @@ const ApplicationsButton = new Lang.Clas
373371 //Load applications
374372 this._displayButtons(this._listApplications(null));
375373