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

dnd: Remove pointless scale factor from restore position

Browse Source 
Since 629b7394 we don't use the preferred size anymore, but the original
allocation, so this scale factor would always be 1.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1687>
This commit is contained in:
Sebastian Keller 2021-02-17 01:07:38 +01:00 committed by Marge Bot
parent a24a16c5ac
commit 8edfe1dcf6
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/ui/dnd.js
View File

@ -661,15 +661,9 @@ var _Draggable = class _Draggable {
if (parentWidth != 0) if (parentWidth != 0)
parentScale = parentScaledWidth / parentWidth; parentScale = parentScaledWidth / parentWidth;
// Also adjust for the difference in the original actor width
// and the width it is now (children of uiGroup always get
// allocated their preferred size)
const childScaleX =
this._dragOrigWidth / this._dragActor.allocation.get_width();
x = parentX + parentScale * this._dragOrigX; x = parentX + parentScale * this._dragOrigX;
y = parentY + parentScale * this._dragOrigY; y = parentY + parentScale * this._dragOrigY;
scale = this._dragOrigScale * parentScale * childScaleX; scale = this._dragOrigScale * parentScale;
} else { } else {
// Snap back actor to its original stage position // Snap back actor to its original stage position
x = this._snapBackX; x = this._snapBackX;