appDisplay: Remove scroll view hack in FrequentView

The frequent view should not be scrolled, but to work around the
icon grid overflowing, we used a (non-scrolling) scroll view anyway.
Now that IconGrid:fillParent allows us to avoid overflow, we can
remove this hack.

https://bugzilla.gnome.org/show_bug.cgi?id=694256
This commit is contained in:
Florian Müllner 2013-02-22 04:29:57 +01:00
parent 5f61b57d63
commit 7425b382d6
2 changed files with 4 additions and 21 deletions

View File

@ -860,11 +860,6 @@ StScrollBar StButton#vhandle:active {
padding: 4px 16px; padding: 4px 16px;
} }
StScrollView.frequent-apps StScrollBar {
min-width: 0px;
width: 0px;
}
.app-folder-icon { .app-folder-icon {
padding: 5px; padding: 5px;
} }

View File

@ -298,23 +298,11 @@ const FrequentView = new Lang.Class({
_init: function() { _init: function() {
this._grid = new IconGrid.IconGrid({ xAlign: St.Align.MIDDLE, this._grid = new IconGrid.IconGrid({ xAlign: St.Align.MIDDLE,
fillParent: true,
columnLimit: MAX_COLUMNS }); columnLimit: MAX_COLUMNS });
let box = new St.BoxLayout({ vertical: true }); this.actor = new St.Widget({ style_class: 'frequent-apps',
box.add(this._grid.actor); x_expand: true, y_expand: true });
this.actor.add_actor(this._grid.actor);
// HACK: IconGrid currently lacks API to only display items that match
// the allocation, so rather than clipping away eventual overflow, we
// use an unscrollable ScrollView with hidden scrollbars to nicely
// fade out cut off items
this.actor = new St.ScrollView({ x_fill: true,
y_fill: false,
y_align: St.Align.START,
x_expand: true,
y_expand: true,
reactive: false,
style_class: 'frequent-apps vfade' });
this.actor.add_actor(box);
this.actor.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
this._usage = Shell.AppUsage.get_default(); this._usage = Shell.AppUsage.get_default();
}, },