diff --git a/plasmoid/package/contents/ui/task/TaskDelegate.qml b/plasmoid/package/contents/ui/task/TaskDelegate.qml index 38e215b28..88eae2be0 100644 --- a/plasmoid/package/contents/ui/task/TaskDelegate.qml +++ b/plasmoid/package/contents/ui/task/TaskDelegate.qml @@ -289,7 +289,7 @@ MouseArea{ //when the task is removed property int indexUsed: index === -1 ? lastValidIndex : index property int separatorSpace: ((parabolicManager.internalSeparatorPos !== -1 && parabolicManager.internalSeparatorPos === indexUsed-1) - || neighbourSeparator) && !isSeparator && !showWindowAnimation.running ? + || neighbourSeparator) && !isSeparator && !showWindowAnimation.running ? (2+root.iconMargin/2) : 0 property real nHiddenSize: (nScale > 0) ? (mainItemContainer.spacersMaxSize * nScale) + separatorSpace : separatorSpace @@ -362,7 +362,7 @@ MouseArea{ //when the task is removed property int indexUsed: index === -1 ? lastValidIndex : index property int separatorSpace: ((parabolicManager.internalSeparatorPos !== -1 && parabolicManager.internalSeparatorPos === indexUsed+1) - || neighbourSeparator) && !isSeparator && !showWindowAnimation.running ? + || neighbourSeparator) && !isSeparator && !showWindowAnimation.running ? (2+root.iconMargin/2) : 0 property real nHiddenSize: (nScale > 0) ? (mainItemContainer.spacersMaxSize * nScale) + separatorSpace : separatorSpace @@ -1136,10 +1136,17 @@ MouseArea{ root.publishTasksGeometries.connect(slotPublishGeometries); root.showPreviewForTasks.connect(slotShowPreviewForTasks); + //startup without launcher + var hideStartup = ((((tasksModel.launcherPosition(mainItemContainer.launcherUrl) == -1) + && (tasksModel.launcherPosition(mainItemContainer.launcherUrlWithIcon) == -1) ) + || !launcherIsPresent(mainItemContainer.launcherUrl)) + && mainItemContainer.isStartup); if ( (isWindow || isStartup) && root.waitingLauncherExists(launcherUrl)) { root.waitingLauncherRemoved.connect(slotWaitingLauncherRemoved); visible = false; + } else if (hideStartup){ + visible = false; } else { visible = true; } diff --git a/plasmoid/package/contents/ui/task/animations/TaskShowWindowAnimation.qml b/plasmoid/package/contents/ui/task/animations/TaskShowWindowAnimation.qml index 1c29850d3..ddfb6098f 100644 --- a/plasmoid/package/contents/ui/task/animations/TaskShowWindowAnimation.qml +++ b/plasmoid/package/contents/ui/task/animations/TaskShowWindowAnimation.qml @@ -106,10 +106,22 @@ SequentialAnimation{ var animation3 = ((!root.taskExists(mainItemContainer.launcherUrl) && mainItemContainer.isLauncher)); + //startup without launcher, animation should be blocked + var hideStartup = ((((tasksModel.launcherPosition(mainItemContainer.launcherUrl) == -1) + && (tasksModel.launcherPosition(mainItemContainer.launcherUrlWithIcon) == -1) ) + || !launcherIsPresent(mainItemContainer.launcherUrl)) + && mainItemContainer.isStartup); + if (( animation2 || animation3) && (root.durationTime !== 0)){ wrapper.tempScaleWidth = 0; wrapper.tempScaleHeight = 0; start(); + } else if (hideStartup) { + mainItemContainer.visible = false; + wrapper.tempScaleWidth = 0; + wrapper.tempScaleHeight = 0; + wrapper.opacity = 0; + mainItemContainer.inAnimation = false; } else { wrapper.tempScaleWidth = 1; wrapper.tempScaleHeight = 1;