fix flyouts on multiple monitors again?
This commit is contained in:
parent
75a94628ad
commit
c59a2c622d
6 changed files with 9 additions and 7 deletions
|
|
@ -17,7 +17,7 @@ Text {
|
||||||
onHoveredChanged: {
|
onHoveredChanged: {
|
||||||
if (hovered && root.tooltip !== "") {
|
if (hovered && root.tooltip !== "") {
|
||||||
M.FlyoutState.text = root.tooltip;
|
M.FlyoutState.text = root.tooltip;
|
||||||
M.FlyoutState.itemX = root.mapToGlobal(root.width / 2, 0).x;
|
M.FlyoutState.itemX = root.mapToGlobal(root.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0);
|
||||||
M.FlyoutState.screen = QsWindow.window?.screen ?? null;
|
M.FlyoutState.screen = QsWindow.window?.screen ?? null;
|
||||||
M.FlyoutState.visible = true;
|
M.FlyoutState.visible = true;
|
||||||
} else if (!hovered && root.tooltip !== "") {
|
} else if (!hovered && root.tooltip !== "") {
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ Text {
|
||||||
onHoveredChanged: {
|
onHoveredChanged: {
|
||||||
if (hovered && root.tooltip !== "") {
|
if (hovered && root.tooltip !== "") {
|
||||||
M.FlyoutState.text = root.tooltip;
|
M.FlyoutState.text = root.tooltip;
|
||||||
M.FlyoutState.itemX = root.mapToGlobal(root.width / 2, 0).x;
|
M.FlyoutState.itemX = root.mapToGlobal(root.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0);
|
||||||
M.FlyoutState.screen = QsWindow.window?.screen ?? null;
|
M.FlyoutState.screen = QsWindow.window?.screen ?? null;
|
||||||
M.FlyoutState.visible = true;
|
M.FlyoutState.visible = true;
|
||||||
} else if (!hovered && root.tooltip !== "") {
|
} else if (!hovered && root.tooltip !== "") {
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ Row {
|
||||||
onHoveredChanged: {
|
onHoveredChanged: {
|
||||||
if (hovered && root.tooltip !== "") {
|
if (hovered && root.tooltip !== "") {
|
||||||
M.FlyoutState.text = root.tooltip;
|
M.FlyoutState.text = root.tooltip;
|
||||||
M.FlyoutState.itemX = root.mapToGlobal(root.width / 2, 0).x;
|
M.FlyoutState.itemX = root.mapToGlobal(root.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0);
|
||||||
M.FlyoutState.screen = QsWindow.window?.screen ?? null;
|
M.FlyoutState.screen = QsWindow.window?.screen ?? null;
|
||||||
M.FlyoutState.visible = true;
|
M.FlyoutState.visible = true;
|
||||||
} else if (!hovered && root.tooltip !== "") {
|
} else if (!hovered && root.tooltip !== "") {
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,9 @@ M.BarIcon {
|
||||||
onClicked: {
|
onClicked: {
|
||||||
const cycle = ["performance", "balanced", "power-saver"];
|
const cycle = ["performance", "balanced", "power-saver"];
|
||||||
const idx = cycle.indexOf(root.profile);
|
const idx = cycle.indexOf(root.profile);
|
||||||
setter.next = cycle[(idx + 1) % cycle.length];
|
const next = cycle[(idx + 1) % cycle.length];
|
||||||
|
root.profile = next;
|
||||||
|
setter.next = next;
|
||||||
setter.running = true;
|
setter.running = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ RowLayout {
|
||||||
.filter(s => s).join("\n") || iconItem.modelData.title;
|
.filter(s => s).join("\n") || iconItem.modelData.title;
|
||||||
if (hovered && tip) {
|
if (hovered && tip) {
|
||||||
M.FlyoutState.text = tip;
|
M.FlyoutState.text = tip;
|
||||||
M.FlyoutState.itemX = iconItem.mapToGlobal(iconItem.width / 2, 0).x;
|
M.FlyoutState.itemX = iconItem.mapToGlobal(iconItem.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0);
|
||||||
M.FlyoutState.screen = QsWindow.window?.screen ?? null;
|
M.FlyoutState.screen = QsWindow.window?.screen ?? null;
|
||||||
M.FlyoutState.visible = true;
|
M.FlyoutState.visible = true;
|
||||||
} else if (!hovered) {
|
} else if (!hovered) {
|
||||||
|
|
@ -69,7 +69,7 @@ RowLayout {
|
||||||
sourceComponent: M.TrayMenu {
|
sourceComponent: M.TrayMenu {
|
||||||
handle: iconItem.modelData.menu
|
handle: iconItem.modelData.menu
|
||||||
screen: root.bar.screen
|
screen: root.bar.screen
|
||||||
anchorX: iconItem.mapToGlobal(iconItem.width / 2, 0).x
|
anchorX: iconItem.mapToGlobal(iconItem.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0)
|
||||||
onMenuClosed: {
|
onMenuClosed: {
|
||||||
menuLoader.active = false;
|
menuLoader.active = false;
|
||||||
root._activeMenu = null;
|
root._activeMenu = null;
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ M.BarIcon {
|
||||||
active: false
|
active: false
|
||||||
sourceComponent: M.PowerMenu {
|
sourceComponent: M.PowerMenu {
|
||||||
screen: root.bar.screen
|
screen: root.bar.screen
|
||||||
anchorX: root.mapToGlobal(root.width / 2, 0).x
|
anchorX: root.mapToGlobal(root.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0)
|
||||||
onMenuClosed: menuLoader.active = false
|
onMenuClosed: menuLoader.active = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue