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

app-display: Expose BaseIcon params in AppWellIcon

Browse Source 
AppWellIcon is used both in the dash and view selector. As the dash
requires manual sizing, it is not possible to set the icon size used
in the view selector in the CSS, but icons will use the default size
(unless set manually as in the dash).

Expose the params parameter of BaseIcon and enable manual resizing
only for AppWellIcons in the dash.

https://bugzilla.gnome.org/show_bug.cgi?id=639428
This commit is contained in:
Florian Müllner 2011-01-13 16:02:55 +01:00
parent 99a865fb0f
commit 38fb51a99e
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/ui/appDisplay.js
View File

@ -281,21 +281,21 @@ PrefsSearchProvider.prototype = {
} }
}; };
function AppIcon(app) { function AppIcon(app, params) {
this._init(app); this._init(app, params);
} }
AppIcon.prototype = { AppIcon.prototype = {
__proto__: IconGrid.BaseIcon.prototype, __proto__: IconGrid.BaseIcon.prototype,
_init : function(app) { _init : function(app, params) {
this.app = app; this.app = app;
let label = this.app.get_name(); let label = this.app.get_name();
IconGrid.BaseIcon.prototype._init.call(this, IconGrid.BaseIcon.prototype._init.call(this,
label, label,
{ setSizeManually: true }); params);
}, },
createIcon: function(iconSize) { createIcon: function(iconSize) {
@ -303,12 +303,12 @@ AppIcon.prototype = {
} }
}; };
function AppWellIcon(app) { function AppWellIcon(app, iconParams) {
this._init(app); this._init(app, iconParams);
} }
AppWellIcon.prototype = { AppWellIcon.prototype = {
_init : function(app) { _init : function(app, iconParams) {
this.app = app; this.app = app;
this.actor = new St.Clickable({ style_class: 'app-well-app', this.actor = new St.Clickable({ style_class: 'app-well-app',
reactive: true, reactive: true,
@ -316,7 +316,7 @@ AppWellIcon.prototype = {
y_fill: true }); y_fill: true });
this.actor._delegate = this; this.actor._delegate = this;
this.icon = new AppIcon(app); this.icon = new AppIcon(app, iconParams);
this.actor.set_child(this.icon.actor); this.actor.set_child(this.icon.actor);
this.actor.connect('clicked', Lang.bind(this, this._onClicked)); this.actor.connect('clicked', Lang.bind(this, this._onClicked));

3
js/ui/dash.js
View File

@ -193,7 +193,8 @@ Dash.prototype = {
}, },
_addApp: function(app) { _addApp: function(app) {
let display = new AppDisplay.AppWellIcon(app); let display = new AppDisplay.AppWellIcon(app,
{ setSizeManually: true });
display._draggable.connect('drag-begin', display._draggable.connect('drag-begin',
Lang.bind(this, function() { Lang.bind(this, function() {
display.actor.opacity = 50; display.actor.opacity = 50;