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

[lg] split inspector event handlers out into separate functions

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=624940
This commit is contained in:
Dan Winship 2010-07-21 11:08:15 -04:00
parent 5bd977dd3c
commit 1a50b94b19
1 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
js/ui/lookingGlass.js
View File

@ -371,48 +371,55 @@ Inspector.prototype = {
vertical: false, vertical: false,
y: primary.y + Math.floor(primary.height / 2), y: primary.y + Math.floor(primary.height / 2),
reactive: true }); reactive: true });
this._eventHandler = eventHandler;
eventHandler.connect('notify::allocation', Lang.bind(this, function () { eventHandler.connect('notify::allocation', Lang.bind(this, function () {
eventHandler.x = primary.x + Math.floor((primary.width - eventHandler.width) / 2); eventHandler.x = primary.x + Math.floor((primary.width - eventHandler.width) / 2);
})); }));
Main.uiGroup.add_actor(eventHandler); Main.uiGroup.add_actor(eventHandler);
let displayText = new St.Label(); this._displayText = new St.Label();
eventHandler.add(displayText, { expand: true }); eventHandler.add(this._displayText, { expand: true });
let borderPaintTarget = null; this._borderPaintTarget = null;
let borderPaintId = null; this._borderPaintId = null;
eventHandler.connect('destroy', Lang.bind(this, function() { eventHandler.connect('destroy', Lang.bind(this, this._onDestroy));
if (borderPaintTarget != null)
borderPaintTarget.disconnect(borderPaintId);
}));
eventHandler.connect('button-press-event', Lang.bind(this, function (actor, event) { eventHandler.connect('button-press-event', Lang.bind(this, this._onButtonPressEvent));
Clutter.ungrab_pointer(eventHandler);
let [stageX, stageY] = event.get_coords(); eventHandler.connect('motion-event', Lang.bind(this, this._onMotionEvent));
let target = global.stage.get_actor_at_pos(Clutter.PickMode.ALL,
stageX,
stageY);
this.emit('target', target, stageX, stageY);
eventHandler.destroy();
this.emit('closed');
return true;
}));
eventHandler.connect('motion-event', Lang.bind(this, function (actor, event) {
let [stageX, stageY] = event.get_coords();
let target = global.stage.get_actor_at_pos(Clutter.PickMode.ALL,
stageX,
stageY);
let position = '[inspect x: ' + stageX + ' y: ' + stageY + ']';
displayText.text = '';
displayText.text = position + ' ' + target;
if (borderPaintTarget != null)
borderPaintTarget.disconnect(borderPaintId);
borderPaintTarget = target;
borderPaintId = Shell.add_hook_paint_red_border(target);
return true;
}));
Clutter.grab_pointer(eventHandler); Clutter.grab_pointer(eventHandler);
},
_onDestroy: function() {
if (this._borderPaintTarget != null)
this._borderPaintTarget.disconnect(this._borderPaintId);
},
_onButtonPressEvent: function (actor, event) {
Clutter.ungrab_pointer(this._eventHandler);
let [stageX, stageY] = event.get_coords();
let target = global.stage.get_actor_at_pos(Clutter.PickMode.ALL,
stageX,
stageY);
this.emit('target', target, stageX, stageY);
this._eventHandler.destroy();
this.emit('closed');
return true;
},
_onMotionEvent: function (actor, event) {
let [stageX, stageY] = event.get_coords();
let target = global.stage.get_actor_at_pos(Clutter.PickMode.ALL,
stageX,
stageY);
let position = '[inspect x: ' + stageX + ' y: ' + stageY + ']';
this._displayText.text = '';
this._displayText.text = position + ' ' + target;
if (this._borderPaintTarget != null)
this._borderPaintTarget.disconnect(this._borderPaintId);
this._borderPaintTarget = target;
this._borderPaintId = Shell.add_hook_paint_red_border(target);
return true;
} }
}; };