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

inspector: Stop using Shell.GenericContainer

Browse Source 
No alarms and no surprises here.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/153
This commit is contained in:
Georges Basile Stavracas Neto 2018-07-09 09:49:37 +02:00
parent 3fa19e58ac
commit b4c674900f
No known key found for this signature in database
GPG Key ID: 886C17EE170D1385
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/ui/lookingGlass.js
View File

@ -4,6 +4,7 @@ const Clutter = imports.gi.Clutter;
const Cogl = imports.gi.Cogl; const Cogl = imports.gi.Cogl;
const GLib = imports.gi.GLib; const GLib = imports.gi.GLib;
const Gio = imports.gi.Gio; const Gio = imports.gi.Gio;
const GObject = imports.gi.GObject;
const Gtk = imports.gi.Gtk; const Gtk = imports.gi.Gtk;
const Meta = imports.gi.Meta; const Meta = imports.gi.Meta;
const Pango = imports.gi.Pango; const Pango = imports.gi.Pango;
@ -501,18 +502,21 @@ var RedBorderEffect = new Lang.Class({
var Inspector = new Lang.Class({ var Inspector = new Lang.Class({
Name: 'Inspector', Name: 'Inspector',
Extends: Clutter.Actor,
Signals: { 'closed': {},
'target': { param_types: [Clutter.Actor.$gtype, GObject.TYPE_DOUBLE, GObject.TYPE_DOUBLE] } },
_init(lookingGlass) { _init(lookingGlass) {
let container = new Shell.GenericContainer({ width: 0, this.parent({ width: 0,
height: 0 }); height: 0 });
container.connect('allocate', this._allocate.bind(this));
Main.uiGroup.add_actor(container); Main.uiGroup.add_actor(this);
let eventHandler = new St.BoxLayout({ name: 'LookingGlassDialog', let eventHandler = new St.BoxLayout({ name: 'LookingGlassDialog',
vertical: false, vertical: false,
reactive: true }); reactive: true });
this._eventHandler = eventHandler; this._eventHandler = eventHandler;
container.add_actor(eventHandler); this.add_actor(eventHandler);
this._displayText = new St.Label(); this._displayText = new St.Label();
eventHandler.add(this._displayText, { expand: true }); eventHandler.add(this._displayText, { expand: true });
@ -534,7 +538,9 @@ var Inspector = new Lang.Class({
this._lookingGlass = lookingGlass; this._lookingGlass = lookingGlass;
}, },
_allocate(actor, box, flags) { vfunc_allocate(box, flags) {
this.set_allocation(box, flags);
if (!this._eventHandler) if (!this._eventHandler)
return; return;
@ -631,8 +637,6 @@ var Inspector = new Lang.Class({
} }
}); });
Signals.addSignalMethods(Inspector.prototype);
var Extensions = new Lang.Class({ var Extensions = new Lang.Class({
Name: 'Extensions', Name: 'Extensions',