kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-25 19:21:41 +03:00
Code Issues Projects Releases Wiki Activity

drop isHalfShown for myView.isShownPartially

Browse Source 
--provide also myView.isShownFully
This commit is contained in:
Michail Vourlakos 2021-01-20 20:51:25 +02:00
parent 7a38642012
commit e9cc81b03a
7 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
containment/package/contents/ui/VisibilityManager.qml
View File

@ -659,12 +659,6 @@ Item{
SequentialAnimation{ SequentialAnimation{
id: slidingAnimationAutoHiddenOut id: slidingAnimationAutoHiddenOut
ScriptAction{
script: {
root.isHalfShown = true;
}
}
PropertyAnimation { PropertyAnimation {
target: !root.behaveAsPlasmaPanel ? layoutsContainer : latteView.positioner target: !root.behaveAsPlasmaPanel ? layoutsContainer : latteView.positioner
property: !root.behaveAsPlasmaPanel ? (root.isVertical ? "x" : "y") : "slideOffset" property: !root.behaveAsPlasmaPanel ? (root.isVertical ? "x" : "y") : "slideOffset"
@ -741,7 +735,6 @@ Item{
ScriptAction{ ScriptAction{
script: { script: {
root.isHalfShown = false;
root.inStartup = false; root.inStartup = false;
} }
} }

2
containment/package/contents/ui/abilities/MyView.qml
View File

@ -30,6 +30,8 @@ AbilityHost.MyView {
inNormalState: ((animations.needBothAxis.count === 0) && (animations.needLength.count === 0)) inNormalState: ((animations.needBothAxis.count === 0) && (animations.needLength.count === 0))
|| (latteView && latteView.visibility.isHidden && !latteView.visibility.containsMouse && animations.needThickness.count === 0) || (latteView && latteView.visibility.isHidden && !latteView.visibility.containsMouse && animations.needThickness.count === 0)
isHidden: isReady && latteView.visibility.isHidden isHidden: isReady && latteView.visibility.isHidden
isShownPartially: isReady && (inSlidingIn || inSlidingOut)
isShownFully: isReady && !isHidden && !inSlidingIn && !inSlidingOut
inSlidingIn: visibilityManager.inSlidingIn inSlidingIn: visibilityManager.inSlidingIn
inSlidingOut: visibilityManager.inSlidingOut inSlidingOut: visibilityManager.inSlidingOut

8
containment/package/contents/ui/applet/ParabolicArea.qml
View File

@ -65,8 +65,8 @@ Item {
return; return;
} }
if (root.isHalfShown || (root.latteApplet if (!appletItem.myView.isShownFully || (root.latteApplet
&& (root.latteApplet.noTasksInAnimation>0 || root.latteApplet.contextMenu))) { && (root.latteApplet.noTasksInAnimation>0 || root.latteApplet.contextMenu))) {
return; return;
} }
@ -80,8 +80,8 @@ Item {
} }
onParabolicMove: { onParabolicMove: {
if (root.isHalfShown || (root.latteApplet if (!appletItem.myView.isShownFully || (root.latteApplet
&& (root.latteApplet.noTasksInAnimation>0 || root.latteApplet.contextMenu))) { && (root.latteApplet.noTasksInAnimation>0 || root.latteApplet.contextMenu))) {
return; return;
} }

1
containment/package/contents/ui/main.qml
View File

@ -217,7 +217,6 @@ Item {
property bool inSlidingIn: visibilityManager ? visibilityManager.inSlidingIn : false property bool inSlidingIn: visibilityManager ? visibilityManager.inSlidingIn : false
property bool inSlidingOut: visibilityManager ? visibilityManager.inSlidingOut : false property bool inSlidingOut: visibilityManager ? visibilityManager.inSlidingOut : false
property bool inStartup: true property bool inStartup: true
property bool isHalfShown: false //is used to disable the zoom hovering effect at sliding in-out the dock
property bool isHorizontal: plasmoid.formFactor === PlasmaCore.Types.Horizontal property bool isHorizontal: plasmoid.formFactor === PlasmaCore.Types.Horizontal
property bool isReady: !(dockIsHidden || inSlidingIn || inSlidingOut) property bool isReady: !(dockIsHidden || inSlidingIn || inSlidingOut)
property bool isVertical: !isHorizontal property bool isVertical: !isHorizontal

2
plasmoid/package/contents/ui/task/ParabolicArea.qml
View File

@ -86,7 +86,7 @@ Item {
if (mousePos<0 || (inBlockingAnimation && !(inAttentionAnimation||inFastRestoreAnimation||inMimicParabolicAnimation))) if (mousePos<0 || (inBlockingAnimation && !(inAttentionAnimation||inFastRestoreAnimation||inMimicParabolicAnimation)))
return; return;
if (root.latteView && root.latteView.isHalfShown) { if (taskItem.abilities.myView.isReady && !taskItem.abilities.myView.isShownFully) {
return; return;
} }

4
plasmoid/package/contents/ui/task/TaskItem.qml
View File

@ -761,8 +761,8 @@ Item {
} }
if(windowsPreviewDlg.activeItem !== taskItem){ if(windowsPreviewDlg.activeItem !== taskItem){
if (!root.latteView if (!taskItem.abilities.myView.isReady
|| (root.latteView && !root.latteView.isHalfShown && !root.latteView.inSlidingIn && !root.latteView.inSlidingOut)) { || (taskItem.abilities.myView.isReady && taskItem.abilities.myView.isShownFully)) {
if (root.latteView && root.titleTooltips) { if (root.latteView && root.titleTooltips) {
root.latteView.hideTooltipLabel(); root.latteView.hideTooltipLabel();
} }

2
plasmoid/package/contents/ui/task/TaskMouseArea.qml
View File

@ -88,7 +88,7 @@ MouseArea {
if ((inBlockingAnimation && !(inAttentionAnimation||inFastRestoreAnimation||inMimicParabolicAnimation))) if ((inBlockingAnimation && !(inAttentionAnimation||inFastRestoreAnimation||inMimicParabolicAnimation)))
return; return;
if (root.latteView && root.latteView.isHalfShown) { if (taskItem.abilities.myView.isReady && !taskItem.abilities.myView.isShownFully) {
return; return;
} }