isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

placesDisplay: Prevent bookmarks from being cut off

Browse Source 
Moving to St.Table introduced a regression that resulted in the height
of Places section to only depend on the height of the left column.

This could result into some bookmarks not being displayed at all because
there are not enough items in the left column to allocate the needed height.

Fix this by removing the St.BoxLayout actors and add the items directly to
the table.

https://bugzilla.gnome.org/show_bug.cgi?id=614144
This commit is contained in:
Adel Gadllah 2010-03-31 16:51:16 +02:00
parent 2ca5cfd6f5
commit 750672061a
2 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/theme/gnome-shell.css
View File

@ -520,7 +520,7 @@ StTooltip {
.places-section {
spacing-columns: 4px;
spacing-rows: 8px;
spacing-rows: 4px;
}
.places-item-box {
@ -537,14 +537,6 @@ StTooltip {
border: 1px solid #666666;
}
.places-actions {
spacing: 2px;
}
#placesDevices {
padding-top: 4px;
}
/* Recent items */
.recent-docs-item-box {

50
js/ui/placeDisplay.js
View File

@ -479,22 +479,9 @@ DashPlaceDisplay.prototype = {
this.actor = new St.Table({ style_class: 'places-section',
homogeneous: true });
this._actionsBox = new St.BoxLayout({ style_class: 'places-actions',
vertical: true });
this._devBox = new St.BoxLayout({ style_class: 'places-actions',
name: 'placesDevices',
vertical: true });
this._dirsBox = new St.BoxLayout({ style_class: 'places-actions',
vertical: true });
// Subdivide left into actions and devices
this.actor.add(this._actionsBox, { row: 0, col: 0 });
this.actor.add(this._devBox, { row: 1, col: 0 });
// Bookmarks span the entire right
this.actor.add(this._dirsBox, { row: 0, col: 1, row_span: 2 });
this._defaultsList = [];
this._bookmarksList = [];
this._mountsList = [];
Main.placesManager.connect('defaults-updated', Lang.bind(this, this._updateDefaults));
Main.placesManager.connect('bookmarks-updated', Lang.bind(this, this._updateBookmarks));
@ -506,27 +493,40 @@ DashPlaceDisplay.prototype = {
},
_updateDefaults: function() {
this._actionsBox.destroy_children();
for (let i = 0; i < this._defaultsList.length; i++)
this._defaultsList[i].destroy();
this._defaultsList = [];
let places = Main.placesManager.getDefaultPlaces();
for (let i = 0; i < places.length; i++)
this._actionsBox.add(new DashPlaceDisplayItem(places[i]).actor);
for (let i = 0; i < places.length; i++) {
this._defaultsList[i] = new DashPlaceDisplayItem(places[i]).actor;
this.actor.add(this._defaultsList[i], {row: i, col: 0});
}
this._updateMounts();
},
_updateMounts: function() {
this._devBox.destroy_children();
for (let i = 0; i < this._mountsList.length; i++)
this._mountsList[i].destroy();
this._mountsList = [];
let places = Main.placesManager.getMounts();
for (let i = 0; i < places.length; i++)
this._devBox.add(new DashPlaceDisplayItem(places[i]).actor);
for (let i = 0; i < places.length; i++) {
this._mountsList[i] = new DashPlaceDisplayItem(places[i]).actor;
this.actor.add(this._mountsList[i], {row: this._defaultsList.length + i, col: 0});
}
},
_updateBookmarks: function() {
this._dirsBox.destroy_children();
for (let i = 0; i < this._bookmarksList.length; i++)
this._bookmarksList[i].destroy();
this._bookmarksList = [];
let places = Main.placesManager.getBookmarks();
for (let i = 0; i < places.length; i ++)
this._dirsBox.add(new DashPlaceDisplayItem(places[i]).actor);
for (let i = 0; i < places.length; i ++) {
this._bookmarksList[i] = new DashPlaceDisplayItem(places[i]).actor;
this.actor.add(this._bookmarksList[i], {row: i, col: 1});
}
}
};