fix: osd hover area + popup notif osd/session dodging
This commit is contained in:
parent
2c5e433b73
commit
f2d023b131
3 changed files with 7 additions and 5 deletions
|
|
@ -156,6 +156,7 @@ Variants {
|
||||||
bar: bar
|
bar: bar
|
||||||
deformAmount: 0.25
|
deformAmount: 0.25
|
||||||
x: panels.sessionWrapper.x + panels.session.x + bar.implicitWidth
|
x: panels.sessionWrapper.x + panels.session.x + bar.implicitWidth
|
||||||
|
implicitWidth: panels.session.width
|
||||||
}
|
}
|
||||||
|
|
||||||
PanelBg {
|
PanelBg {
|
||||||
|
|
@ -175,6 +176,7 @@ Variants {
|
||||||
bar: bar
|
bar: bar
|
||||||
deformAmount: 0.3
|
deformAmount: 0.3
|
||||||
x: panels.osdWrapper.x + panels.osd.x + bar.implicitWidth
|
x: panels.osdWrapper.x + panels.osd.x + bar.implicitWidth
|
||||||
|
implicitWidth: panels.osd.width
|
||||||
}
|
}
|
||||||
|
|
||||||
PanelBg {
|
PanelBg {
|
||||||
|
|
|
||||||
|
|
@ -102,7 +102,7 @@ CustomMouseArea {
|
||||||
visibilities.bar = false;
|
visibilities.bar = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (panels.sidebar.anchors.rightMargin === -panels.sidebar.implicitWidth - 5) {
|
if (panels.sidebar.offsetScale === 1) {
|
||||||
// Show osd on hover
|
// Show osd on hover
|
||||||
const showOsd = inRightPanel(panels.osdWrapper, x, y);
|
const showOsd = inRightPanel(panels.osdWrapper, x, y);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ Item {
|
||||||
anchors.rightMargin: sessionWrapper.anchors.rightMargin + session.width * (1 - session.offsetScale)
|
anchors.rightMargin: sessionWrapper.anchors.rightMargin + session.width * (1 - session.offsetScale)
|
||||||
clip: sidebar.visible || session.visible
|
clip: sidebar.visible || session.visible
|
||||||
|
|
||||||
implicitWidth: osd.implicitWidth
|
implicitWidth: osd.implicitWidth * (1 - osd.offsetScale)
|
||||||
implicitHeight: osd.implicitHeight
|
implicitHeight: osd.implicitHeight
|
||||||
|
|
||||||
Osd.Wrapper {
|
Osd.Wrapper {
|
||||||
|
|
@ -64,8 +64,8 @@ Item {
|
||||||
|
|
||||||
visibilities: root.visibilities
|
visibilities: root.visibilities
|
||||||
sidebarPanel: sidebar
|
sidebarPanel: sidebar
|
||||||
osdPanel: osd
|
osdPanel: osdWrapper
|
||||||
sessionPanel: session
|
sessionPanel: sessionWrapper
|
||||||
|
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
|
@ -79,7 +79,7 @@ Item {
|
||||||
anchors.rightMargin: sidebar.width * (1 - sidebar.offsetScale)
|
anchors.rightMargin: sidebar.width * (1 - sidebar.offsetScale)
|
||||||
clip: sidebar.visible
|
clip: sidebar.visible
|
||||||
|
|
||||||
implicitWidth: session.implicitWidth
|
implicitWidth: session.implicitWidth * (1 - session.offsetScale)
|
||||||
implicitHeight: session.implicitHeight
|
implicitHeight: session.implicitHeight
|
||||||
|
|
||||||
Session.Wrapper {
|
Session.Wrapper {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue