nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: allow hover drawers when border < 2

Browse source 
Closes #1297
This commit is contained in:
2 * r + 2 * t 2026-03-19 21:36:48 +11:00
parent 0548365a8c
commit 70d6225186
5 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/BorderConfig.qml
View file

@ -3,4 +3,7 @@ import Quickshell.Io
JsonObject { JsonObject {
property int thickness: Appearance.padding.normal property int thickness: Appearance.padding.normal
property int rounding: Appearance.rounding.large property int rounding: Appearance.rounding.large
readonly property int minThickness: 2
readonly property int clampedThickness: Math.max(minThickness, thickness)
} }

1
modules/bar/BarWrapper.qml
View file

@ -14,6 +14,7 @@ Item {
required property BarPopouts.Wrapper popouts required property BarPopouts.Wrapper popouts
required property bool disabled required property bool disabled
readonly property int clampedWidth: Math.max(Config.border.minThickness, implicitWidth)
readonly property int padding: Math.max(Appearance.padding.smaller, Config.border.thickness) readonly property int padding: Math.max(Appearance.padding.smaller, Config.border.thickness)
readonly property int contentWidth: Config.bar.sizes.innerWidth + padding * 2 readonly property int contentWidth: Config.bar.sizes.innerWidth + padding * 2
readonly property int exclusiveZone: !disabled && (Config.bar.persistent || visibilities.bar) ? contentWidth : Config.border.thickness readonly property int exclusiveZone: !disabled && (Config.bar.persistent || visibilities.bar) ? contentWidth : Config.border.thickness

2
modules/controlcenter/appearance/sections/BorderSection.qml
View file

@ -50,7 +50,7 @@ CollapsibleSection {
label: qsTr("Border thickness") label: qsTr("Border thickness")
value: rootPane.borderThickness value: rootPane.borderThickness
from: 0.1 from: 0
to: 100 to: 100
decimals: 1 decimals: 1
suffix: "px" suffix: "px"

8
modules/drawers/Drawers.qml
View file

@ -57,10 +57,10 @@ Variants {
WlrLayershell.keyboardFocus: visibilities.launcher || visibilities.session ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None WlrLayershell.keyboardFocus: visibilities.launcher || visibilities.session ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
mask: Region { mask: Region {
x: bar.implicitWidth + win.dragMaskPadding x: bar.clampedWidth + win.dragMaskPadding
y: Config.border.thickness + win.dragMaskPadding y: Config.border.clampedThickness + win.dragMaskPadding
width: win.width - bar.implicitWidth - Config.border.thickness - win.dragMaskPadding * 2 width: win.width - bar.clampedWidth - Config.border.clampedThickness - win.dragMaskPadding * 2
height: win.height - Config.border.thickness * 2 - win.dragMaskPadding * 2 height: win.height - Config.border.clampedThickness * 2 - win.dragMaskPadding * 2
intersection: Intersection.Xor intersection: Intersection.Xor
regions: regions.instances regions: regions.instances

16
modules/drawers/Interactions.qml
View file

@ -33,15 +33,15 @@ CustomMouseArea {
} }
function inRightPanel(panel: Item, x: real, y: real): bool { function inRightPanel(panel: Item, x: real, y: real): bool {
return x > bar.implicitWidth + panel.x && withinPanelHeight(panel, x, y); return x > Math.min(width - Config.border.minThickness, bar.implicitWidth + panel.x) && withinPanelHeight(panel, x, y);
} }
function inTopPanel(panel: Item, x: real, y: real): bool { function inTopPanel(panel: Item, x: real, y: real): bool {
return y < Config.border.thickness + panel.y + panel.height && withinPanelWidth(panel, x, y); return y < Math.max(Config.border.minThickness, Config.border.thickness + panel.height) + panel.y && withinPanelWidth(panel, x, y);
} }
function inBottomPanel(panel: Item, x: real, y: real): bool { function inBottomPanel(panel: Item, x: real, y: real, isCorner = false): bool {
return y > root.height - Config.border.thickness - panel.height - Config.border.rounding && withinPanelWidth(panel, x, y); return y > height - Math.max(Config.border.minThickness, Config.border.thickness + panel.height) - (isCorner ? Config.border.rounding : 0) && withinPanelWidth(panel, x, y);
} }
function onWheel(event: WheelEvent): void { function onWheel(event: WheelEvent): void {
@ -88,11 +88,11 @@ CustomMouseArea {
const dragY = y - dragStart.y; const dragY = y - dragStart.y;
// Show bar in non-exclusive mode on hover // Show bar in non-exclusive mode on hover
if (!visibilities.bar && Config.bar.showOnHover && x < bar.implicitWidth) if (!visibilities.bar && Config.bar.showOnHover && x < bar.clampedWidth)
bar.isHovered = true; bar.isHovered = true;
// Show/hide bar on drag // Show/hide bar on drag
if (pressed && dragStart.x < bar.implicitWidth) { if (pressed && dragStart.x < bar.clampedWidth) {
if (dragX > Config.bar.dragThreshold) if (dragX > Config.bar.dragThreshold)
visibilities.bar = true; visibilities.bar = true;
else if (dragX < -Config.bar.dragThreshold) else if (dragX < -Config.bar.dragThreshold)
@ -113,7 +113,7 @@ CustomMouseArea {
root.panels.osd.hovered = true; root.panels.osd.hovered = true;
} }
const showSidebar = pressed && dragStart.x > bar.implicitWidth + panels.sidebar.x; const showSidebar = pressed && dragStart.x > Math.min(width - Config.border.minThickness, bar.implicitWidth + panels.sidebar.x);
// Show/hide session on drag // Show/hide session on drag
if (pressed && inRightPanel(panels.session, dragStart.x, dragStart.y) && withinPanelHeight(panels.session, x, y)) { if (pressed && inRightPanel(panels.session, dragStart.x, dragStart.y) && withinPanelHeight(panels.session, x, y)) {
@ -188,7 +188,7 @@ CustomMouseArea {
} }
// Show utilities on hover // Show utilities on hover
const showUtilities = inBottomPanel(panels.utilities, x, y); const showUtilities = inBottomPanel(panels.utilities, x, y, true);
// Always update visibility based on hover if not in shortcut mode // Always update visibility based on hover if not in shortcut mode
if (!utilitiesShortcutActive) { if (!utilitiesShortcutActive) {