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

windowManager: Rename functions and variables

Browse Source 
Stop using the word 'fullscreen' since the code is also
going to be used for maximize and tile actions.

https://bugzilla.gnome.org/show_bug.cgi?id=766685
This commit is contained in:
Alessandro Bono 2017-05-20 19:34:51 +02:00
parent 4dfad536a3
commit a72f0604dc
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
js/ui/windowManager.js
View File

@ -1316,12 +1316,12 @@ const WindowManager = new Lang.Class({
if ((whichChange == Meta.SizeChange.FULLSCREEN || if ((whichChange == Meta.SizeChange.FULLSCREEN ||
whichChange == Meta.SizeChange.UNFULLSCREEN) && whichChange == Meta.SizeChange.UNFULLSCREEN) &&
oldFrameRect.width > 0 && oldFrameRect.height > 0) oldFrameRect.width > 0 && oldFrameRect.height > 0)
this._fullscreenAnimation(shellwm, actor, oldFrameRect, whichChange); this._prepareAnimationInfo(shellwm, actor, oldFrameRect, whichChange);
else else
shellwm.completed_size_change(actor); shellwm.completed_size_change(actor);
}, },
_fullscreenAnimation: function(shellwm, actor, oldFrameRect, change) { _prepareAnimationInfo: function(shellwm, actor, oldFrameRect, change) {
// Position a clone of the window on top of the old position, // Position a clone of the window on top of the old position,
// while actor updates are frozen. // while actor updates are frozen.
let actorContent = Shell.util_get_content_for_window_actor(actor, oldFrameRect); let actorContent = Shell.util_get_content_for_window_actor(actor, oldFrameRect);
@ -1331,22 +1331,22 @@ const WindowManager = new Lang.Class({
actorClone.set_size(oldFrameRect.width, oldFrameRect.height); actorClone.set_size(oldFrameRect.width, oldFrameRect.height);
Main.uiGroup.add_actor(actorClone); Main.uiGroup.add_actor(actorClone);
if (this._clearFullscreenInfo(actor)) if (this._clearAnimationInfo(actor))
this._shellwm.completed_size_change(actor); this._shellwm.completed_size_change(actor);
actor.__fullscreenInfo = { clone: actorClone, actor.__animationInfo = { clone: actorClone,
oldRect: oldFrameRect }; oldRect: oldFrameRect };
}, },
_sizeChangedWindow: function(shellwm, actor) { _sizeChangedWindow: function(shellwm, actor) {
if (!actor.__fullscreenInfo) if (!actor.__animationInfo)
return; return;
if (this._resizing.indexOf(actor) != -1) if (this._resizing.indexOf(actor) != -1)
return; return;
let actorClone = actor.__fullscreenInfo.clone; let actorClone = actor.__animationInfo.clone;
let targetRect = actor.meta_window.get_frame_rect(); let targetRect = actor.meta_window.get_frame_rect();
let sourceRect = actor.__fullscreenInfo.oldRect; let sourceRect = actor.__animationInfo.oldRect;
let scaleX = targetRect.width / sourceRect.width; let scaleX = targetRect.width / sourceRect.width;
let scaleY = targetRect.height / sourceRect.height; let scaleY = targetRect.height / sourceRect.height;
@ -1393,10 +1393,10 @@ const WindowManager = new Lang.Class({
shellwm.completed_size_change(actor); shellwm.completed_size_change(actor);
}, },
_clearFullscreenInfo: function(actor) { _clearAnimationInfo: function(actor) {
if (actor.__fullscreenInfo) { if (actor.__animationInfo) {
actor.__fullscreenInfo.clone.destroy(); actor.__animationInfo.clone.destroy();
delete actor.__fullscreenInfo; delete actor.__animationInfo;
return true; return true;
} }
return false; return false;
@ -1409,13 +1409,13 @@ const WindowManager = new Lang.Class({
actor.scale_y = 1.0; actor.scale_y = 1.0;
actor.translation_x = 0; actor.translation_x = 0;
actor.translation_y = 0; actor.translation_y = 0;
this._clearFullscreenInfo(actor); this._clearAnimationInfo(actor);
} }
}, },
_sizeChangeWindowOverwritten: function(shellwm, actor) { _sizeChangeWindowOverwritten: function(shellwm, actor) {
if (this._removeEffect(this._resizing, actor)) if (this._removeEffect(this._resizing, actor))
this._clearFullscreenInfo(actor); this._clearAnimationInfo(actor);
}, },
_hasAttachedDialogs: function(window, ignoreWindow) { _hasAttachedDialogs: function(window, ignoreWindow) {