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

Bug 587955 - Small cleanups to iconButton

Browse Source 
Missing trailing ; after "this._fadeOut()". A few missing spaces after "if". Parameter inconsistently named "icon" instead of "texture".
This commit is contained in:
Milan Bouchet-Valat 2009-07-11 18:44:21 +02:00
parent b45cd0a4eb
commit 177edc5444
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/ui/button.js
View File

@ -128,14 +128,14 @@ const ANIMATION_TIME = 0.25;
* size -- size in pixels of both the button and the icon it contains * size -- size in pixels of both the button and the icon it contains
* texture -- optional, must be used if the texture for the icon is already created (else, use setIconFromName) * texture -- optional, must be used if the texture for the icon is already created (else, use setIconFromName)
*/ */
function iconButton(parent, size, icon) { function iconButton(parent, size, texture) {
this._init(parent, size, icon); this._init(parent, size, texture);
} }
iconButton.prototype = { iconButton.prototype = {
_init : function(parent, size, texture) { _init : function(parent, size, texture) {
this._size = size; this._size = size;
if(texture) if (texture)
this.actor = texture; this.actor = texture;
else else
this.actor = new Clutter.Texture({ width: this._size, height: this._size }); this.actor = new Clutter.Texture({ width: this._size, height: this._size });
@ -145,23 +145,23 @@ iconButton.prototype = {
this._shouldHide = false; this._shouldHide = false;
// Nothing to do if the cursor has come back from a child of the parent actor // Nothing to do if the cursor has come back from a child of the parent actor
if(actor.get_children().indexOf(Shell.get_event_related(event)) != -1) if (actor.get_children().indexOf(Shell.get_event_related(event)) != -1)
return; return;
this._fadeIn(); this._fadeIn();
})); }));
parent.connect("leave-event", Lang.bind(this, function(actor, event) { parent.connect("leave-event", Lang.bind(this, function(actor, event) {
// Nothing to do if the cursor has merely entered a child of the parent actor // Nothing to do if the cursor has merely entered a child of the parent actor
if(actor.get_children().indexOf(Shell.get_event_related(event)) != -1) if (actor.get_children().indexOf(Shell.get_event_related(event)) != -1)
return; return;
// Remember that we should not be visible to hide the button if forceShow is unset // Remember that we should not be visible to hide the button if forceShow is unset
if(this._forceShow) { if (this._forceShow) {
this._shouldHide = true; this._shouldHide = true;
return; return;
} }
this._fadeOut() this._fadeOut();
})); }));
}, },
@ -187,7 +187,7 @@ iconButton.prototype = {
forceShow : function(show) { forceShow : function(show) {
this._forceShow = show; this._forceShow = show;
// Hide the button if it should have been hidden under normal conditions // Hide the button if it should have been hidden under normal conditions
if(!this._forceShow && this._shouldHide) { if (!this._forceShow && this._shouldHide) {
this._fadeOut(); this._fadeOut();
} }
}, },