dragging:respect placeholder in length fill calcs

--reduce glitches when dragging applets around and there
are also fillLength applets in Justify alignment
pull/27/head
Michail Vourlakos 3 years ago
parent 42b3bf5c06
commit 12098a1ea2

@ -40,11 +40,9 @@ Item {
value: { value: {
var space = 0; var space = 0;
for (var i=0; i<grid.children.length; ++i){ for (var i=0; i<grid.children.length; ++i){
if (grid.children[i] if (grid.children[i] && (grid.children[i].isPlaceHolder || (!grid.children[i].isAutoFillApplet && !grid.children[i].isHidden))) {
&& !grid.children[i].isAutoFillApplet
&& !grid.children[i].isHidden) {
if (grid.children[i].isInternalViewSplitter) { if (!grid.children[i].isPlaceHolder && grid.children[i].isInternalViewSplitter) {
space += root.maxJustifySplitterSize; space += root.maxJustifySplitterSize;
} else { } else {
space = root.isHorizontal ? space + grid.children[i].width : space + grid.children[i].height; space = root.isHorizontal ? space + grid.children[i].width : space + grid.children[i].height;
@ -64,9 +62,7 @@ Item {
value: { value: {
var space = 0; var space = 0;
for (var i=0; i<grid.children.length; ++i){ for (var i=0; i<grid.children.length; ++i){
if (grid.children[i] if (grid.children[i] && (grid.children[i].isPlaceHolder || (!grid.children[i].isInternalViewSplitter && !grid.children[i].isHidden))) {
&& !grid.children[i].isInternalViewSplitter
&& !grid.children[i].isHidden) {
space = root.isHorizontal ? space + grid.children[i].width : space + grid.children[i].height; space = root.isHorizontal ? space + grid.children[i].width : space + grid.children[i].height;
} }
} }
@ -86,7 +82,7 @@ Item {
for (var i=0; i<grid.children.length; ++i){ for (var i=0; i<grid.children.length; ++i){
if (grid.children[i] && grid.children[i].isHidden) { if (grid.children[i] && grid.children[i].isHidden) {
//do nothing //do nothing
} else if (grid.children[i] && grid.children[i].applet){/*internal splitters are ignored this way*/ } else if (grid.children[i] && (grid.children[i].isPlaceHolder || grid.children[i].applet)){/*internal splitters are ignored this way*/
res = res + 1; res = res + 1;
} }
} }
@ -103,7 +99,10 @@ Item {
value: { value: {
var no = 0; var no = 0;
for (var i=0; i<grid.children.length; ++i){ for (var i=0; i<grid.children.length; ++i){
if (grid.children[i] && grid.children[i].isAutoFillApplet && !grid.children[i].isHidden) { if (grid.children[i]
&& !grid.children[i].isPlaceHolder
&& grid.children[i].isAutoFillApplet
&& !grid.children[i].isHidden) {
//console.log("fill :::: " + children[i].applet.pluginName); //console.log("fill :::: " + children[i].applet.pluginName);
no++; no++;
} }
@ -120,7 +119,11 @@ Item {
value: { value: {
var no = 0; var no = 0;
for (var i=0; i<grid.children.length; ++i){ for (var i=0; i<grid.children.length; ++i){
if (grid.children[i] && grid.children[i].isRequestingFill && grid.children[i].applet && !grid.children[i].isHidden) { if (grid.children[i]
&& !grid.children[i].isPlaceHolder
&& grid.children[i].isRequestingFill
&& grid.children[i].applet
&& !grid.children[i].isHidden) {
//console.log("fill :::: " + children[i].applet.pluginName); //console.log("fill :::: " + children[i].applet.pluginName);
no++; no++;
} }
@ -179,9 +182,9 @@ Item {
for (var i=0; i<grid.children.length; ++i){ for (var i=0; i<grid.children.length; ++i){
if (grid.children[i] if (grid.children[i]
&& grid.children[i].isPlaceHolder && !grid.children[i].isPlaceHolder
|| (grid.children[i].isInternalViewSplitter && grid.children[i].isInternalViewSplitter
&& !grid.children[i].isHidden)) { && !grid.children[i].isHidden) {
intsSplits = intsSplits + 1; intsSplits = intsSplits + 1;
} }
} }

@ -94,6 +94,7 @@ Item {
&& ((applet && applet.status === PlasmaCore.Types.HiddenStatus ) || isInternalViewSplitter) && ((applet && applet.status === PlasmaCore.Types.HiddenStatus ) || isInternalViewSplitter)
property bool isInternalViewSplitter: (internalSplitterId > 0) property bool isInternalViewSplitter: (internalSplitterId > 0)
property bool isZoomed: false property bool isZoomed: false
property bool isPlaceHolder: false
property bool isPressed: viewSignalsConnector.pressed property bool isPressed: viewSignalsConnector.pressed
property bool isSeparator: applet && (applet.pluginName === "audoban.applet.separator" property bool isSeparator: applet && (applet.pluginName === "audoban.applet.separator"
|| applet.pluginName === "org.kde.latte.separator") || applet.pluginName === "org.kde.latte.separator")

Loading…
Cancel
Save