fix launcher height calculations
This commit is contained in:
@@ -132,6 +132,8 @@ CustomMouseArea {
|
|||||||
if (!inDashboardArea) {
|
if (!inDashboardArea) {
|
||||||
root.dashboardShortcutActive = true;
|
root.dashboardShortcutActive = true;
|
||||||
}
|
}
|
||||||
|
if (root.panels.launcher.x + root.panels.launcher.width > root.panels.dashboardWrapper.x)
|
||||||
|
root.visibilities.launcher = false;
|
||||||
|
|
||||||
root.visibilities.settings = false;
|
root.visibilities.settings = false;
|
||||||
root.visibilities.sidebar = false;
|
root.visibilities.sidebar = false;
|
||||||
@@ -161,6 +163,11 @@ CustomMouseArea {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (root.visibilities.launcher) {
|
if (root.visibilities.launcher) {
|
||||||
|
if (root.panels.dashboardWrapper.x < root.panels.launcher.x + root.panels.launcher.width) {
|
||||||
|
console.log("true");
|
||||||
|
root.visibilities.dashboard = false;
|
||||||
|
}
|
||||||
|
|
||||||
root.visibilities.dock = false;
|
root.visibilities.dock = false;
|
||||||
root.visibilities.settings = false;
|
root.visibilities.settings = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,11 +12,10 @@ Item {
|
|||||||
property int contentHeight
|
property int contentHeight
|
||||||
readonly property real maxHeight: {
|
readonly property real maxHeight: {
|
||||||
let max = screen.height - Appearance.spacing.large * 2;
|
let max = screen.height - Appearance.spacing.large * 2;
|
||||||
if (visibilities.resources)
|
if (visibilities.resources && panels.resourcesWrapper.x + panels.resourcesWrapper.width > root.x)
|
||||||
max -= panels.resources.nonAnimHeight;
|
max -= panels.resources.nonAnimHeight;
|
||||||
if (visibilities.dashboard && panels.dashboard.x < root.x + root.implicitWidth)
|
if (panels.popouts.hasCurrent)
|
||||||
max -= panels.dashboard.nonAnimHeight;
|
if (panels.popouts.current.x + panels.popouts.current.width > root.x && panels.popouts.current.x < root.x + root.width)
|
||||||
if (panels.popouts.currentName.startsWith("updates"))
|
|
||||||
max -= panels.popouts.nonAnimHeight;
|
max -= panels.popouts.nonAnimHeight;
|
||||||
return max;
|
return max;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import qs.Config
|
|||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
||||||
readonly property real nonAnimHeight: state === "visible" ? (content.item?.nonAnimHeight ?? 0) : 0
|
readonly property real nonAnimHeight: content.item?.nonAnimHeight ?? 0
|
||||||
property real offsetScale: shouldBeActive ? 0 : 1
|
property real offsetScale: shouldBeActive ? 0 : 1
|
||||||
readonly property bool shouldBeActive: root.visibilities.resources
|
readonly property bool shouldBeActive: root.visibilities.resources
|
||||||
required property PersistentProperties visibilities
|
required property PersistentProperties visibilities
|
||||||
@@ -31,8 +31,7 @@ Item {
|
|||||||
id: content
|
id: content
|
||||||
|
|
||||||
active: root.shouldBeActive || root.visible
|
active: root.shouldBeActive || root.visible
|
||||||
anchors.bottom: parent.bottom
|
anchors.centerIn: parent
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
|
||||||
|
|
||||||
sourceComponent: Content {
|
sourceComponent: Content {
|
||||||
padding: Appearance.padding.normal
|
padding: Appearance.padding.normal
|
||||||
|
|||||||
Reference in New Issue
Block a user