Skip to content

fix(frame): add widget end inset for edge widgets when Frame is enabled #2600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ultherego wants to merge 1 commit into from
+30 −5
Closed

fix(frame): add widget end inset for edge widgets when Frame is enabled #2600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions quickshell/Common/SettingsData.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,8 @@ Singleton {
readonly property string frameModalEmergeSide: frameLauncherEmergeSide === "top" ? "bottom" : "top"
property string frameMode: "connected"
onFrameModeChanged: saveSettings()
property int frameBarEndInset: 0
onFrameBarEndInsetChanged: saveSettings()
property var connectedFrameBarStyleBackups: ({})
onConnectedFrameBarStyleBackupsChanged: saveSettings()
readonly property bool connectedFrameModeActive: frameEnabled && frameMode === "connected"
Expand Down
3 changes: 2 additions & 1 deletion quickshell/Common/settings/SettingsSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,8 @@ var SPEC = {
frameCloseGaps: { def: true },
frameLauncherEmergeSide: { def: "bottom" },
frameLauncherArcExtender: { def: false },
frameMode: { def: "connected" }
frameMode: { def: "connected" },
frameBarEndInset: { def: 0 }
};

function getValidKeys() {
Expand Down
9 changes: 5 additions & 4 deletions quickshell/Modules/DankBar/DankBarContent.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,26 @@ Item {
onHasAdjacentRightBarLiveChanged: if (hasAdjacentRightBarLive)
_hadAdjacentRightBar = true

readonly property real _frameEndInset: SettingsData.frameThickness + SettingsData.frameBarEndInset
readonly property real _frameLeftInset: {
if (!_hasBarWindow || !SettingsData.frameEnabled || !_usesFrameBarChrome || _barIsVertical)
return 0;
return hasAdjacentLeftBarLive ? SettingsData.frameBarSize : (_hadAdjacentLeftBar ? _frameEdgeFloorInset : 0);
return hasAdjacentLeftBarLive ? SettingsData.frameBarSize : (_hadAdjacentLeftBar ? _frameEdgeFloorInset : _frameEndInset);
}
readonly property real _frameRightInset: {
if (!_hasBarWindow || !SettingsData.frameEnabled || !_usesFrameBarChrome || _barIsVertical)
return 0;
return hasAdjacentRightBarLive ? SettingsData.frameBarSize : (_hadAdjacentRightBar ? _frameEdgeFloorInset : 0);
return hasAdjacentRightBarLive ? SettingsData.frameBarSize : (_hadAdjacentRightBar ? _frameEdgeFloorInset : _frameEndInset);
}
readonly property real _frameTopInset: {
if (!_hasBarWindow || !SettingsData.frameEnabled || !_usesFrameBarChrome || !_barIsVertical)
return 0;
return hasAdjacentTopBarLive ? SettingsData.frameThickness : (_hadAdjacentTopBar ? _frameEdgeFloorInset : 0);
return hasAdjacentTopBarLive ? SettingsData.frameThickness : (_hadAdjacentTopBar ? _frameEdgeFloorInset : _frameEndInset);
}
readonly property real _frameBottomInset: {
if (!_hasBarWindow || !SettingsData.frameEnabled || !_usesFrameBarChrome || !_barIsVertical)
return 0;
return hasAdjacentBottomBarLive ? SettingsData.frameThickness : (_hadAdjacentBottomBar ? _frameEdgeFloorInset : 0);
return hasAdjacentBottomBarLive ? SettingsData.frameThickness : (_hadAdjacentBottomBar ? _frameEdgeFloorInset : _frameEndInset);
}

property alias hLeftSection: hLeftSection
Expand Down
21 changes: 21 additions & 0 deletions quickshell/Modules/Settings/FrameTab.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,27 @@ Item {
}
}

SettingsSliderRow {
id: barEndInsetSlider
settingKey: "frameBarEndInset"
tags: ["frame", "bar", "end", "inset", "widget", "padding", "edge"]
text: I18n.tr("Widget End Inset")
description: I18n.tr("Extra space between edge widgets and the frame corners")
unit: "px"
minimum: 0
maximum: 20
step: 1
defaultValue: 0
value: SettingsData.frameBarEndInset
onSliderDragFinished: v => SettingsData.set("frameBarEndInset", v)

Binding {
target: barEndInsetSlider
property: "value"
value: SettingsData.frameBarEndInset
}
}

SettingsSliderRow {
id: opacitySlider
settingKey: "frameOpacity"
Expand Down
Loading