workspace: Stop exporting window actor in the WindowPreview

Having a public property exporting the MetaWindow is enough to get the
window actor, too, so remove the public realWindow property and while at
it, rename that property to _windowActor, too.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1307
This commit is contained in:
Jonas Dreßler 2020-06-08 10:01:27 +02:00
parent 6bef9334b7
commit 8357739ef8

View File

@ -217,7 +217,7 @@ var WindowPreview = GObject.registerClass({
_init(metaWindow, workspace) { _init(metaWindow, workspace) {
this.metaWindow = metaWindow; this.metaWindow = metaWindow;
this.metaWindow._delegate = this; this.metaWindow._delegate = this;
this.realWindow = metaWindow.get_compositor_private(); this._windowActor = metaWindow.get_compositor_private();
this._workspace = workspace; this._workspace = workspace;
super._init({ super._init({
@ -235,7 +235,7 @@ var WindowPreview = GObject.registerClass({
this._windowContainer.layout_manager = new WindowPreviewLayout(); this._windowContainer.layout_manager = new WindowPreviewLayout();
this.add_child(this._windowContainer); this.add_child(this._windowContainer);
this._addWindow(realWindow.meta_window); this._addWindow(metaWindow);
this._delegate = this; this._delegate = this;
@ -250,7 +250,7 @@ var WindowPreview = GObject.registerClass({
}); });
this._windowDestroyId = this._windowDestroyId =
this.realWindow.connect('destroy', () => this.destroy()); this._windowActor.connect('destroy', () => this.destroy());
this._updateAttachedDialogs(); this._updateAttachedDialogs();
this.x = this.boundingBox.x; this.x = this.boundingBox.x;
@ -612,7 +612,7 @@ var WindowPreview = GObject.registerClass({
} }
_onDestroy() { _onDestroy() {
this.realWindow.disconnect(this._windowDestroyId); this._windowActor.disconnect(this._windowDestroyId);
this.metaWindow._delegate = null; this.metaWindow._delegate = null;
this._delegate = null; this._delegate = null;