Commit c67a8775 authored by Michail Vourlakos's avatar Michail Vourlakos
Browse files

fix Floating Gap SideBar case not accepting input

BUG:433820
parent 393db028
......@@ -323,11 +323,7 @@ Item{
target: latteView && latteView.visibility ? latteView.visibility : null
property: "isFloatingGapWindowEnabled"
when: latteView && latteView.visibility
value: root.screenEdgeMarginEnabled
&& !latteView.byPassWM
&& !root.inConfigureAppletsMode
&& !parabolic.isEnabled
&& (root.behaveAsPlasmaPanel || (root.behaveAsDockWithMask && !root.floatingInternalGapIsForced))
value: root.hasFloatingGapInputEventsDisabled
&& (latteView.visibility.mode === LatteCore.Types.AutoHide
|| latteView.visibility.mode === LatteCore.Types.DodgeActive
|| latteView.visibility.mode === LatteCore.Types.DodgeAllWindows
......@@ -640,13 +636,13 @@ Item{
if (latteView.visibility.isHidden) {
inputThickness = metrics.mask.thickness.hidden;
} else if (latteView.visibility.isFloatingGapWindowEnabled) {
} else if (root.hasFloatingGapInputEventsDisabled) {
inputThickness = metrics.totals.thickness;
} else {
inputThickness = metrics.mask.screenEdge + metrics.totals.thickness;
}
var subtractedScreenEdge = latteView.visibility.isFloatingGapWindowEnabled ? metrics.mask.screenEdge : 0;
var subtractedScreenEdge = root.hasFloatingGapInputEventsDisabled ? metrics.mask.screenEdge : 0;
var inputGeometry = Qt.rect(0, 0, root.width, root.height);
......
......@@ -133,6 +133,12 @@ Item {
property bool floatingInternalGapIsForced: plasmoid.configuration.floatingInternalGapIsForced
property bool hasFloatingGapInputEventsDisabled: root.screenEdgeMarginEnabled
&& !latteView.byPassWM
&& !root.inConfigureAppletsMode
&& !parabolic.isEnabled
&& (root.behaveAsPlasmaPanel || (root.behaveAsDockWithMask && !root.floatingInternalGapIsForced))
property bool forceSolidPanel: (latteView && latteView.visibility
&& LatteCore.WindowSystem.compositingActive
&& !inConfigureAppletsMode
......
......@@ -57,7 +57,8 @@ Item {
}
if (plasmoid.location === PlasmaCore.Types.LeftEdge) {
return latteView.maxNormalThickness + ruler.thickness + headMargin * 2 - width/2 + height/2;
var screenEdge = latteView.behaveAsPlasmaPanel ? latteView.screenEdgeMargin : 0;
return screenEdge + latteView.maxNormalThickness + ruler.thickness + headMargin * 2 - width/2 + height/2;
} else if (plasmoid.location === PlasmaCore.Types.RightEdge) {
return headMargin - width/2 + height/2;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment