Use TextureCache to load the information icon
Use TextureCache to load the information icon, so that we don't create a new ClutterTexture for information icons corresponding to each display item.
This commit is contained in:
parent
dc7b2b03e1
commit
3a7447dacc
@ -74,14 +74,17 @@ GenericDisplayItem.prototype = {
|
|||||||
width: availableWidth, height: ITEM_DISPLAY_HEIGHT });
|
width: availableWidth, height: ITEM_DISPLAY_HEIGHT });
|
||||||
this.actor.add_actor(this._bg);
|
this.actor.add_actor(this._bg);
|
||||||
|
|
||||||
this._informationButton = new Clutter.Texture({ x: availableWidth - ITEM_DISPLAY_PADDING_RIGHT - INFORMATION_BUTTON_SIZE,
|
|
||||||
y: ITEM_DISPLAY_HEIGHT / 2 - INFORMATION_BUTTON_SIZE / 2,
|
|
||||||
width: INFORMATION_BUTTON_SIZE,
|
|
||||||
height: INFORMATION_BUTTON_SIZE,
|
|
||||||
reactive: true
|
|
||||||
});
|
|
||||||
let global = Shell.Global.get();
|
let global = Shell.Global.get();
|
||||||
this._informationButton.set_from_file(global.imagedir + "info.svg");
|
let infoIconUri = "file://" + global.imagedir + "info.svg";
|
||||||
|
|
||||||
|
this._informationButton = Shell.TextureCache.get_default().load_uri_sync(infoIconUri,
|
||||||
|
INFORMATION_BUTTON_SIZE,
|
||||||
|
INFORMATION_BUTTON_SIZE);
|
||||||
|
|
||||||
|
this._informationButton.x = availableWidth - ITEM_DISPLAY_PADDING_RIGHT - INFORMATION_BUTTON_SIZE;
|
||||||
|
this._informationButton.y = ITEM_DISPLAY_HEIGHT / 2 - INFORMATION_BUTTON_SIZE / 2;
|
||||||
|
this._informationButton.reactive = true;
|
||||||
|
|
||||||
// Connecting to the button-press-event for the information button ensures that the actor,
|
// Connecting to the button-press-event for the information button ensures that the actor,
|
||||||
// which is a draggable actor, does not get the button-press-event and doesn't initiate
|
// which is a draggable actor, does not get the button-press-event and doesn't initiate
|
||||||
// the dragging, which then prevents us from getting the button-release-event for the button.
|
// the dragging, which then prevents us from getting the button-release-event for the button.
|
||||||
|
Loading…
Reference in New Issue
Block a user