github-forks
/
latte-dock
mirror of https://github.com/KDE/latte-dock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

drop deprecated inForcedHiding

Browse Source
work/spdx
Michail Vourlakos 4 years ago
parent 1ec0b924d4
commit 2ed1bedd5f
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File

22
containment/package/contents/ui/VisibilityManager.qml
Unescape Escape View File

@ -45,7 +45,6 @@ Item{
(root.editMode ? 400 : animations.speedFactor.current * 1.62 * animations.duration.large) : 0 (root.editMode ? 400 : animations.speedFactor.current * 1.62 * animations.duration.large) : 0
property bool inClientSideScreenEdgeSliding: root.behaveAsDockWithMask && hideThickScreenGap property bool inClientSideScreenEdgeSliding: root.behaveAsDockWithMask && hideThickScreenGap
property bool inForcedHiding: false //is used when the docks are forced in hiding e.g. when changing layouts
property bool inNormalState: ((animations.needBothAxis.count === 0) && (animations.needLength.count === 0)) property bool 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)
property bool inRelocationAnimation: latteView && latteView.positioner && latteView.positioner.inRelocationAnimation property bool inRelocationAnimation: latteView && latteView.positioner && latteView.positioner.inRelocationAnimation
@ -80,13 +79,13 @@ Item{
property Item layouts: null property Item layouts: null
property bool updateIsEnabled: autosize.inCalculatedIconSize && !inSlidingIn && !inSlidingOut && !inRelocationHiding && !inForcedHiding property bool updateIsEnabled: autosize.inCalculatedIconSize && !inSlidingIn && !inSlidingOut && !inRelocationHiding
Binding{ Binding{
target: latteView target: latteView
property:"maxThickness" property:"maxThickness"
//! prevents updating window geometry during closing window in wayland and such fixes a crash //! prevents updating window geometry during closing window in wayland and such fixes a crash
when: latteView && !inRelocationHiding && !inForcedHiding && !(inClientSideScreenEdgeSliding && !inStartup) when: latteView && !inRelocationHiding && !inClientSideScreenEdgeSliding && !inStartup
value: root.behaveAsPlasmaPanel ? thicknessAsPanel : metrics.mask.thickness.maxZoomed value: root.behaveAsPlasmaPanel ? thicknessAsPanel : metrics.mask.thickness.maxZoomed
} }
@ -107,7 +106,7 @@ Item{
Binding { Binding {
target: latteView target: latteView
property: "headThicknessGap" property: "headThicknessGap"
when: latteView && updateIsEnabled && !inForcedHiding && !inClientSideScreenEdgeSliding when: latteView && updateIsEnabled && !inClientSideScreenEdgeSliding
value: { value: {
if (root.behaveAsPlasmaPanel || root.viewType === LatteCore.Types.PanelView || latteView.byPassWM) { if (root.behaveAsPlasmaPanel || root.viewType === LatteCore.Types.PanelView || latteView.byPassWM) {
return 0; return 0;
@ -258,14 +257,14 @@ Item{
value: LatteCore.WindowSystem.compositingActive value: LatteCore.WindowSystem.compositingActive
&& (((root.blurEnabled && root.useThemePanel) && (((root.blurEnabled && root.useThemePanel)
|| (root.blurEnabled && root.forceSolidPanel && LatteCore.WindowSystem.compositingActive)) || (root.blurEnabled && root.forceSolidPanel && LatteCore.WindowSystem.compositingActive))
&& (!root.inStartup || inForcedHiding || inRelocationHiding)) && (!root.inStartup || inRelocationHiding))
} }
Binding{ Binding{
target: latteView && latteView.effects ? latteView.effects : null target: latteView && latteView.effects ? latteView.effects : null
property: "drawShadows" property: "drawShadows"
when: latteView && latteView.effects when: latteView && latteView.effects
value: root.drawShadowsExternal && (!root.inStartup || inForcedHiding || inRelocationHiding) && !(latteView && latteView.visibility.isHidden) value: root.drawShadowsExternal && (!root.inStartup || inRelocationHiding) && !(latteView && latteView.visibility.isHidden)
} }
Binding{ Binding{
@ -426,7 +425,7 @@ Item{
if(latteView.visibility.containsMouse && latteView.visibility.mode !== LatteCore.Types.SidebarOnDemand) { if(latteView.visibility.containsMouse && latteView.visibility.mode !== LatteCore.Types.SidebarOnDemand) {
updateMaskArea(); updateMaskArea();
if (slidingAnimationAutoHiddenOut.running && !inRelocationHiding && !inForcedHiding) { if (slidingAnimationAutoHiddenOut.running && !inRelocationHiding) {
slotMustBeShown(); slotMustBeShown();
} }
} }
@ -449,7 +448,7 @@ Item{
} }
//! Normal Dodge/AutoHide case //! Normal Dodge/AutoHide case
if (!slidingAnimationAutoHiddenIn.running && !inRelocationHiding && !inForcedHiding){ if (!slidingAnimationAutoHiddenIn.running && !inRelocationHiding){
slidingAnimationAutoHiddenIn.init(); slidingAnimationAutoHiddenIn.init();
} }
} }
@ -471,10 +470,9 @@ Item{
} }
//! Normal Dodge/AutoHide case //! Normal Dodge/AutoHide case
if((!slidingAnimationAutoHiddenOut.running if (!slidingAnimationAutoHiddenOut.running
&& !latteView.visibility.blockHiding && !latteView.visibility.blockHiding
&& (!latteView.visibility.containsMouse || latteView.visibility.mode === LatteCore.Types.SidebarOnDemand)) && (!latteView.visibility.containsMouse || latteView.visibility.mode === LatteCore.Types.SidebarOnDemand)) {
|| inForcedHiding) {
slidingAnimationAutoHiddenOut.init(); slidingAnimationAutoHiddenOut.init();
} }
} }

Write Preview
Loading…
Cancel
Save