fix #66, many automatic size issues

--fix #51, a bug that by dropping a new applet
the normal state was blocked and couldnt return normal,
that could create an issue with masking
pull/1/head
Michail Vourlakos 8 years ago
parent 9a0b17fbc0
commit 0d45ca3393

@ -481,6 +481,11 @@ DragDrop.DropArea {
plasmoid.processMimeData(event.mimeData, relevantLayout.x, relevantLayout.y); plasmoid.processMimeData(event.mimeData, relevantLayout.x, relevantLayout.y);
event.accept(event.proposedAction); event.accept(event.proposedAction);
if (confirmedDragEntered) {
slotAnimationsNeedLength(-1);
confirmedDragEntered = false;
}
dndSpacer.opacity = 0; dndSpacer.opacity = 0;
dndSpacer.parent = root; dndSpacer.parent = root;
} }
@ -504,6 +509,8 @@ DragDrop.DropArea {
} }
} }
onIconSizeChanged: visibilityManager.updateMaskArea();
// onIconSizeChanged: console.log("Icon Size Changed:"+iconSize); // onIconSizeChanged: console.log("Icon Size Changed:"+iconSize);
Component.onCompleted: { Component.onCompleted: {
@ -872,11 +879,13 @@ DragDrop.DropArea {
} }
function updateAutomaticIconSize() { function updateAutomaticIconSize() {
if (visibilityManager.normalState //&& !root.editMode
if ((visibilityManager.normalState || root.editMode)
&& (iconSize===plasmoid.configuration.iconSize || iconSize === automaticIconSizeBasedSize) ) { && (iconSize===plasmoid.configuration.iconSize || iconSize === automaticIconSizeBasedSize) ) {
var layoutLength; var layoutLength;
var maxLength = dock.maxLength; var maxLength = dock.maxLength;
// console.log("------Entered check-----"); //console.log("------Entered check-----");
//console.log("max length: "+ maxLength);
if (root.isVertical) { if (root.isVertical) {
layoutLength = (plasmoid.configuration.panelPosition === Latte.Dock.Justify) ? layoutLength = (plasmoid.configuration.panelPosition === Latte.Dock.Justify) ?
@ -901,10 +910,10 @@ DragDrop.DropArea {
} while ( (nextLength>toShrinkLimit) && (nextIconSize !== 16)); } while ( (nextLength>toShrinkLimit) && (nextIconSize !== 16));
automaticIconSizeBasedSize = nextIconSize; automaticIconSizeBasedSize = nextIconSize;
// console.log("Step 3 - found:"+automaticIconSizeBasedSize); console.log("Step 3 - found:"+automaticIconSizeBasedSize);
} else if ((layoutLength<toGrowLimit } else if ((layoutLength<toGrowLimit
&& (iconSize === automaticIconSizeBasedSize)) ) { //must grow probably && (iconSize === automaticIconSizeBasedSize)) ) { //must grow probably
// console.log("step4"); // console.log("step4");
var nextIconSize2 = automaticIconSizeBasedSize; var nextIconSize2 = automaticIconSizeBasedSize;
var foundGoodSize = -1; var foundGoodSize = -1;
@ -924,9 +933,9 @@ DragDrop.DropArea {
} else { } else {
automaticIconSizeBasedSize = foundGoodSize; automaticIconSizeBasedSize = foundGoodSize;
} }
// console.log("Step 4 - found:"+automaticIconSizeBasedSize); // console.log("Step 4 - found:"+automaticIconSizeBasedSize);
} else { } else {
// console.log("Step 4 - did not found..."); // console.log("Step 4 - did not found...");
} }
} }
} }
@ -1014,7 +1023,8 @@ DragDrop.DropArea {
Item { Item {
id: dndSpacer id: dndSpacer
property int normalSize: visibilityManager.statesLineSizeOriginal + plasmoid.configuration.iconSize + visibilityManager.iconMarginOriginal - 1 property int normalSize: root.statesLineSize + root.iconSize + root.iconMargin - 1
//visibilityManager.statesLineSizeOriginal + plasmoid.configuration.iconSize + visibilityManager.iconMarginOriginal - 1
width: normalSize width: normalSize
height: normalSize height: normalSize
@ -1092,13 +1102,17 @@ DragDrop.DropArea {
property int count: children.length property int count: children.length
onWidthChanged: { onWidthChanged: {
if (root.isHorizontal && dock && (width+secondLayout.width >= dock.maxLength)) { if (root.isHorizontal
&& ( (dock && (width+secondLayout.width >= dock.maxLength))
|| (root.editMode)) ){
updateAutomaticIconSize(); updateAutomaticIconSize();
} }
} }
onHeightChanged: { onHeightChanged: {
if (root.isVertical && dock && (height+secondLayout.height >= dock.maxLength)) { if (root.isVertical
&& ( (dock && (height+secondLayout.height >= dock.maxLength))
|| (root.editMode)) ){
updateAutomaticIconSize(); updateAutomaticIconSize();
} }
} }

Loading…
Cancel
Save