wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 964204 - fix drag glitches in Australis panel and palette, r=mikedeboer

Browse Source 
--HG--
extra : rebase_source : ca944ff625641f4c69141d7740d40d243b9971b4
This commit is contained in:
Gijs Kruitbosch 2014-01-27 18:44:34 +00:00
parent 82d21bdfd6
commit 7a68e77608
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
browser/components/customizableui/src/CustomizeMode.jsm
View File

@ -1411,10 +1411,13 @@ CustomizeMode.prototype = {
_setGridDragActive: function(aDragOverNode, aDraggedItem, aValue) { _setGridDragActive: function(aDragOverNode, aDraggedItem, aValue) {
let targetArea = this._getCustomizableParent(aDragOverNode); let targetArea = this._getCustomizableParent(aDragOverNode);
let draggedWrapper = this.document.getElementById("wrapper-" + aDraggedItem.id);
let originArea = this._getCustomizableParent(draggedWrapper);
let positionManager = DragPositionManager.getManagerForArea(targetArea); let positionManager = DragPositionManager.getManagerForArea(targetArea);
let draggedSize = this._getDragItemSize(aDragOverNode, aDraggedItem); let draggedSize = this._getDragItemSize(aDragOverNode, aDraggedItem);
let isWide = aDraggedItem.classList.contains(CustomizableUI.WIDE_PANEL_CLASS); let isWide = aDraggedItem.classList.contains(CustomizableUI.WIDE_PANEL_CLASS);
positionManager.insertPlaceholder(targetArea, aDragOverNode, isWide, draggedSize); positionManager.insertPlaceholder(targetArea, aDragOverNode, isWide, draggedSize,
originArea == targetArea);
}, },
_getDragItemSize: function(aDragOverNode, aDraggedItem) { _getDragItemSize: function(aDragOverNode, aDraggedItem) {

7
browser/components/customizableui/src/DragPositionManager.jsm
View File

@ -126,7 +126,7 @@ AreaPositionManager.prototype = {
* they would have if we had inserted something before aBefore. We use CSS * they would have if we had inserted something before aBefore. We use CSS
* transforms for this, which are CSS transitioned. * transforms for this, which are CSS transitioned.
*/ */
insertPlaceholder: function(aContainer, aBefore, aWide, aSize) { insertPlaceholder: function(aContainer, aBefore, aWide, aSize, aIsFromThisArea) {
let isShifted = false; let isShifted = false;
let shiftDown = aWide; let shiftDown = aWide;
for (let child of aContainer.children) { for (let child of aContainer.children) {
@ -157,7 +157,7 @@ AreaPositionManager.prototype = {
if (this.__moveDown) { if (this.__moveDown) {
shiftDown = true; shiftDown = true;
} }
if (!this._lastPlaceholderInsertion) { if (aIsFromThisArea && !this._lastPlaceholderInsertion) {
child.setAttribute("notransition", "true"); child.setAttribute("notransition", "true");
} }
// Determine the CSS transform based on the next node: // Determine the CSS transform based on the next node:
@ -167,7 +167,8 @@ AreaPositionManager.prototype = {
child.style.transform = ""; child.style.transform = "";
} }
} }
if (aContainer.lastChild && !this._lastPlaceholderInsertion) { if (aContainer.lastChild && aIsFromThisArea &&
!this._lastPlaceholderInsertion) {
// Flush layout: // Flush layout:
aContainer.lastChild.getBoundingClientRect(); aContainer.lastChild.getBoundingClientRect();
// then remove all the [notransition] // then remove all the [notransition]

1
browser/themes/shared/customizableui/customizeMode.inc.css
View File

@ -75,6 +75,7 @@ toolbarpaletteitem[place="panel"] {
transition: transform .3s ease-in-out; transition: transform .3s ease-in-out;
} }
toolbarpaletteitem[notransition].panel-customization-placeholder,
toolbarpaletteitem[notransition][place="palette"], toolbarpaletteitem[notransition][place="palette"],
toolbarpaletteitem[notransition][place="panel"] { toolbarpaletteitem[notransition][place="panel"] {
transition: none; transition: none;