tooltip flyout border matches module accent color
This commit is contained in:
parent
5b901478c7
commit
91657003c0
7 changed files with 9 additions and 1 deletions
|
|
@ -70,6 +70,7 @@ Text {
|
||||||
M.FlyoutState.text = root.tooltip;
|
M.FlyoutState.text = root.tooltip;
|
||||||
M.FlyoutState.itemX = root.mapToGlobal(root.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0);
|
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.accentColor = parent?.accentColor ?? root.color;
|
||||||
M.FlyoutState.visible = true;
|
M.FlyoutState.visible = true;
|
||||||
} else if (!hovered && root.tooltip !== "") {
|
} else if (!hovered && root.tooltip !== "") {
|
||||||
M.FlyoutState.visible = false;
|
M.FlyoutState.visible = false;
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,7 @@ Text {
|
||||||
M.FlyoutState.text = root.tooltip;
|
M.FlyoutState.text = root.tooltip;
|
||||||
M.FlyoutState.itemX = root.mapToGlobal(root.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0);
|
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.accentColor = parent?.accentColor ?? root.color;
|
||||||
M.FlyoutState.visible = true;
|
M.FlyoutState.visible = true;
|
||||||
} else if (!hovered && root.tooltip !== "") {
|
} else if (!hovered && root.tooltip !== "") {
|
||||||
M.FlyoutState.visible = false;
|
M.FlyoutState.visible = false;
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,7 @@ Row {
|
||||||
M.FlyoutState.text = root.tooltip;
|
M.FlyoutState.text = root.tooltip;
|
||||||
M.FlyoutState.itemX = root.mapToGlobal(root.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0);
|
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.accentColor = root.accentColor;
|
||||||
M.FlyoutState.visible = true;
|
M.FlyoutState.visible = true;
|
||||||
} else if (!hovered && root.tooltip !== "") {
|
} else if (!hovered && root.tooltip !== "") {
|
||||||
M.FlyoutState.visible = false;
|
M.FlyoutState.visible = false;
|
||||||
|
|
|
||||||
|
|
@ -85,12 +85,14 @@ PanelWindow {
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
color: M.Theme.base00
|
color: M.Theme.base01
|
||||||
opacity: Math.max(M.Theme.barOpacity, 0.85)
|
opacity: Math.max(M.Theme.barOpacity, 0.85)
|
||||||
topLeftRadius: 0
|
topLeftRadius: 0
|
||||||
topRightRadius: 0
|
topRightRadius: 0
|
||||||
bottomLeftRadius: M.Theme.radius
|
bottomLeftRadius: M.Theme.radius
|
||||||
bottomRightRadius: M.Theme.radius
|
bottomRightRadius: M.Theme.radius
|
||||||
|
border.color: M.FlyoutState.accentColor
|
||||||
|
border.width: 1
|
||||||
}
|
}
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
|
|
|
||||||
|
|
@ -6,4 +6,5 @@ QtObject {
|
||||||
property string text: ""
|
property string text: ""
|
||||||
property real itemX: 0
|
property real itemX: 0
|
||||||
property var screen: null
|
property var screen: null
|
||||||
|
property color accentColor: "#cdd6f4"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -76,6 +76,7 @@ RowLayout {
|
||||||
M.FlyoutState.text = tip;
|
M.FlyoutState.text = tip;
|
||||||
M.FlyoutState.itemX = iconItem.mapToGlobal(iconItem.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0);
|
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.accentColor = root.parent?.accentColor ?? M.Theme.base05;
|
||||||
M.FlyoutState.visible = true;
|
M.FlyoutState.visible = true;
|
||||||
} else if (!hovered) {
|
} else if (!hovered) {
|
||||||
M.FlyoutState.visible = false;
|
M.FlyoutState.visible = false;
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,7 @@ Row {
|
||||||
M.FlyoutState.text = name;
|
M.FlyoutState.text = name;
|
||||||
M.FlyoutState.itemX = pill.mapToGlobal(pill.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0);
|
M.FlyoutState.itemX = pill.mapToGlobal(pill.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.accentColor = root.parent?.accentColor ?? M.Theme.base05;
|
||||||
M.FlyoutState.visible = true;
|
M.FlyoutState.visible = true;
|
||||||
} else {
|
} else {
|
||||||
M.FlyoutState.visible = false;
|
M.FlyoutState.visible = false;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue