**bounciness**
This commit is contained in:
+16
-16
@@ -96,25 +96,25 @@ CustomMouseArea {
|
||||
if (dragY < -10)
|
||||
visibilities.dock = true;
|
||||
|
||||
if (panels.sidebar.width === 0) {
|
||||
const showOsd = inRightPanel(panels.osd, x, y);
|
||||
if (panels.sidebar.width === 0) {
|
||||
const showOsd = inRightPanel(panels.osdWrapper, x, y);
|
||||
|
||||
if (showOsd) {
|
||||
osdShortcutActive = false;
|
||||
root.panels.osd.hovered = true;
|
||||
}
|
||||
} else {
|
||||
const outOfSidebar = x < width - panels.sidebar.width;
|
||||
const showOsd = outOfSidebar && inRightPanel(panels.osd, x, y);
|
||||
if (showOsd) {
|
||||
osdShortcutActive = false;
|
||||
root.panels.osd.hovered = true;
|
||||
}
|
||||
} else {
|
||||
const outOfSidebar = x < width - panels.sidebar.width;
|
||||
const showOsd = outOfSidebar && inRightPanel(panels.osdWrapper, x, y);
|
||||
|
||||
if (!osdShortcutActive) {
|
||||
visibilities.osd = showOsd;
|
||||
root.panels.osd.hovered = showOsd;
|
||||
} else if (showOsd) {
|
||||
osdShortcutActive = false;
|
||||
root.panels.osd.hovered = true;
|
||||
if (!osdShortcutActive) {
|
||||
visibilities.osd = showOsd;
|
||||
root.panels.osd.hovered = showOsd;
|
||||
} else if (showOsd) {
|
||||
osdShortcutActive = false;
|
||||
root.panels.osd.hovered = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (Config.dock.enable && !Config.dock.hoverToReveal && !visibilities.dock && !visibilities.launcher && inBottomPanel(panels.dock, x, y))
|
||||
visibilities.dock = true;
|
||||
|
||||
+23
-11
@@ -26,6 +26,7 @@ Item {
|
||||
readonly property alias launcher: launcher
|
||||
readonly property alias notifications: notifications
|
||||
readonly property alias osd: osd
|
||||
readonly property alias osdWrapper: osdWrapper
|
||||
readonly property alias popouts: popouts.content
|
||||
readonly property alias popoutsWrapper: popouts
|
||||
readonly property alias resources: resources
|
||||
@@ -48,6 +49,28 @@ Item {
|
||||
visibilities: root.visibilities
|
||||
}
|
||||
|
||||
Item {
|
||||
id: osdWrapper
|
||||
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: sidebar.width * (1 - sidebar.offsetScale)
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
clip: sidebar.visible
|
||||
|
||||
implicitHeight: osd.implicitHeight
|
||||
implicitWidth: osd.implicitWidth * (1 - osd.offsetScale)
|
||||
|
||||
Osd.Wrapper {
|
||||
id: osd
|
||||
|
||||
anchors.right: parent.right
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
screen: root.screen
|
||||
sidebarOrSessionVisible: sidebar.visible
|
||||
visibilities: root.visibilities
|
||||
}
|
||||
}
|
||||
|
||||
Drawing.Wrapper {
|
||||
id: drawing
|
||||
|
||||
@@ -58,17 +81,6 @@ Item {
|
||||
visibilities: root.visibilities
|
||||
}
|
||||
|
||||
Osd.Wrapper {
|
||||
id: osd
|
||||
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: sidebar.width
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
clip: sidebar.width > 0
|
||||
screen: root.screen
|
||||
visibilities: root.visibilities
|
||||
}
|
||||
|
||||
Modules.ClipWrapper {
|
||||
id: popouts
|
||||
|
||||
|
||||
+4
-2
@@ -188,7 +188,7 @@ Variants {
|
||||
|
||||
bottomLeftRadius: 0
|
||||
deformAmount: 0.1 * Config.appearance.deform.scale
|
||||
exclude: panels.sidebar.offsetscale > 0.08 ? [] : [utilsBg]
|
||||
exclude: panels.sidebar.offsetScale > 0.08 ? [] : [utilsBg]
|
||||
implicitHeight: panel.height * (1 / rawDeformMatrix.m22) + 2
|
||||
panel: panels.sidebar
|
||||
}
|
||||
@@ -197,8 +197,10 @@ Variants {
|
||||
id: osdBg
|
||||
|
||||
deformAmount: 0.1 * Config.appearance.deform.scale
|
||||
panel: panels.osd
|
||||
implicitWidth: panels.osd.width
|
||||
panel: panels.osdWrapper
|
||||
radius: 20
|
||||
x: panels.osdWrapper.x + panels.osd.x + Config.barConfig.border
|
||||
}
|
||||
|
||||
PanelBg {
|
||||
|
||||
Reference in New Issue
Block a user