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

workspace: Make some functions in WindowPreview private

Browse Source 
Now that the WindowPreview also shows the overlays itself, we can make
some functions private.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1307
This commit is contained in:
Jonas Dreßler 2020-06-08 15:26:41 +02:00
parent 96f5e2b33e
commit d4f8ea1c53
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/workspace.js
View File

@ -349,7 +349,7 @@ var WindowPreview = GObject.registerClass({
pivot_point: new Graphene.Point({ x: -1, y: 0.5 }), pivot_point: new Graphene.Point({ x: -1, y: 0.5 }),
factor: 0, factor: 0,
})); }));
this._closeButton.connect('clicked', () => this.deleteAll()); this._closeButton.connect('clicked', () => this._deleteAll());
this.add_child(this._borderCenter); this.add_child(this._borderCenter);
this.add_child(this._border); this.add_child(this._border);
@ -396,7 +396,7 @@ var WindowPreview = GObject.registerClass({
_windowCanClose() { _windowCanClose() {
return this.metaWindow.can_close() && return this.metaWindow.can_close() &&
!this.hasAttachedDialogs(); !this._hasAttachedDialogs();
} }
_getCaption() { _getCaption() {
@ -507,10 +507,10 @@ var WindowPreview = GObject.registerClass({
} }
vfunc_has_overlaps() { vfunc_has_overlaps() {
return this.hasAttachedDialogs(); return this._hasAttachedDialogs();
} }
deleteAll() { _deleteAll() {
const windows = this._windowContainer.layout_manager.getWindows(); const windows = this._windowContainer.layout_manager.getWindows();
// Delete all windows, starting from the bottom-most (most-modal) one // Delete all windows, starting from the bottom-most (most-modal) one
@ -539,7 +539,7 @@ var WindowPreview = GObject.registerClass({
this._activate(); this._activate();
} }
hasAttachedDialogs() { _hasAttachedDialogs() {
return this._windowContainer.layout_manager.getWindows().length > 1; return this._windowContainer.layout_manager.getWindows().length > 1;
} }
@ -580,13 +580,13 @@ var WindowPreview = GObject.registerClass({
} }
// Find the actor just below us, respecting reparenting done by DND code // Find the actor just below us, respecting reparenting done by DND code
getActualStackAbove() { _getActualStackAbove() {
if (this._stackAbove == null) if (this._stackAbove == null)
return null; return null;
if (this.inDrag) { if (this.inDrag) {
if (this._stackAbove._delegate) if (this._stackAbove._delegate)
return this._stackAbove._delegate.getActualStackAbove(); return this._stackAbove._delegate._getActualStackAbove();
else else
return null; return null;
} else { } else {
@ -601,7 +601,7 @@ var WindowPreview = GObject.registerClass({
return; return;
let parent = this.get_parent(); let parent = this.get_parent();
let actualAbove = this.getActualStackAbove(); let actualAbove = this._getActualStackAbove();
if (actualAbove == null) if (actualAbove == null)
parent.set_child_below_sibling(this, null); parent.set_child_below_sibling(this, null);
else else