Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Bugfix, 1.6.?] Resize existing icons in window list applet, ... #1362

Merged
merged 1 commit into from Nov 14, 2012
Merged

[Bugfix, 1.6.?] Resize existing icons in window list applet, ... #1362

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 20 additions & 19 deletions files/usr/share/cinnamon/applets/window-list@cinnamon.org/applet.js
View file
Open in desktop
Expand Up @@ -295,23 +295,13 @@ AppMenuButton.prototype = {

let tracker = Cinnamon.WindowTracker.get_default();
this.app = tracker.get_window_app(this.metaWindow);
if (global.settings.get_boolean('panel-scale-text-icons') && global.settings.get_boolean('panel-resizable')) {
this.iconSize = Math.round(panel_height * ICON_HEIGHT_FACTOR);
} else {
this.iconSize = DEFAULT_ICON_SIZE;
}

let icon = this.app ?
this.app.create_icon_texture(this.iconSize) :
new St.Icon({ icon_name: 'application-default-icon',
icon_type: St.IconType.FULLCOLOR,
icon_size: this.iconSize });
this.set_icon(panel_height);
let title = this.getDisplayTitle();
if (metaWindow.minimized)
this._label.set_text("[" + title + "]");
else
this._label.set_text(title);
this._iconBox.set_child(icon);

if(animation){
this.startAnimation();
this.stopAnimation();
Expand Down Expand Up @@ -407,12 +397,6 @@ AppMenuButton.prototype = {
},

doFocus: function() {
let tracker = Cinnamon.WindowTracker.get_default();
let app = tracker.get_window_app(this.metaWindow);
if ( app ) {
let icon = app.create_icon_texture(this.iconSize);
this._iconBox.set_child(icon);
}
if (this.metaWindow.has_focus() && !this.metaWindow.minimized) {
this.actor.add_style_pseudo_class('focus');
this.actor.remove_style_class_name("window-list-item-demands-attention");
Expand Down Expand Up @@ -606,6 +590,21 @@ AppMenuButton.prototype = {
// we show as the item is being dragged.
getDragActorSource: function() {
return this.actor;
},

set_icon: function(panel_height) {
if (global.settings.get_boolean('panel-scale-text-icons') && global.settings.get_boolean('panel-resizable')) {
this.iconSize = Math.round(panel_height * ICON_HEIGHT_FACTOR);
}
else {
this.iconSize = DEFAULT_ICON_SIZE;
}
let icon = this.app ?
this.app.create_icon_texture(this.iconSize) :
new St.Icon({ icon_name: 'application-default-icon',
icon_type: St.IconType.FULLCOLOR,
icon_size: this.iconSize });
this._iconBox.set_child(icon);
}
};

Expand Down Expand Up @@ -799,7 +798,9 @@ MyApplet.prototype = {

_onFocus: function() {
for ( let i = 0; i < this._windows.length; ++i ) {
this._windows[i].doFocus();
let window = this._windows[i];
window.set_icon(this._panelHeight);
window.doFocus();
}
},

Expand Down