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

feat: sidebar margins ignore border

Browse source
This commit is contained in:
2 * r + 2 * t 2026-05-06 19:34:44 +10:00
parent 07348758f1
commit e29be58790
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/dashboard/Content.qml
View file

@ -4,6 +4,7 @@ import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
import Quickshell import Quickshell
import Quickshell.Widgets import Quickshell.Widgets
import Caelestia
import Caelestia.Config import Caelestia.Config
import qs.components import qs.components
import qs.components.filedialog import qs.components.filedialog
@ -57,7 +58,7 @@ Item {
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.topMargin: Math.min(anchors.margins, Math.max(0, anchors.margins - Config.border.thickness)) anchors.topMargin: CUtils.clamp(anchors.margins - Config.border.thickness, 0, anchors.margins)
anchors.margins: Tokens.padding.large anchors.margins: Tokens.padding.large
nonAnimWidth: root.nonAnimWidth - anchors.margins * 2 nonAnimWidth: root.nonAnimWidth - anchors.margins * 2

1
modules/drawers/Panels.qml
View file

@ -149,5 +149,6 @@ Item {
anchors.top: notifications.bottom anchors.top: notifications.bottom
anchors.bottom: utilities.top anchors.bottom: utilities.top
anchors.right: parent.right anchors.right: parent.right
anchors.topMargin: -notifications.anchors.topMargin
} }
} }

6
modules/sidebar/Wrapper.qml
View file

@ -1,6 +1,7 @@
pragma ComponentBehavior: Bound pragma ComponentBehavior: Bound
import QtQuick import QtQuick
import Caelestia
import Caelestia.Config import Caelestia.Config
import qs.components import qs.components
@ -28,13 +29,14 @@ Item {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.margins: Tokens.padding.large anchors.leftMargin: Tokens.padding.large
anchors.margins: CUtils.clamp(anchors.leftMargin - Config.border.thickness, 0, anchors.leftMargin)
anchors.bottomMargin: 0 anchors.bottomMargin: 0
active: root.shouldBeActive || root.visible active: root.shouldBeActive || root.visible
sourceComponent: Content { sourceComponent: Content {
implicitWidth: Tokens.sizes.sidebar.width - Tokens.padding.extraLargeIncreased implicitWidth: Tokens.sizes.sidebar.width - content.anchors.leftMargin - content.anchors.margins
props: root.props props: root.props
visibilities: root.visibilities visibilities: root.visibilities
} }