diff options
| author | littleblack111 <littleblack11111@gmail.com> | 2026-02-15 14:24:23 +0800 |
|---|---|---|
| committer | littleblack111 <littleblack11111@gmail.com> | 2026-02-15 14:24:23 +0800 |
| commit | 19635217b2ef957ff38719b046cb7fe380a70b88 (patch) | |
| tree | 2d1b8b879ba56c9c5ff2027fa0e2027af14ddc28 | |
| parent | 3d8d5969f26cf343ba732361e39ab26a575e1ba6 (diff) | |
style: no longer floating, docked
| -rw-r--r-- | bar/ActiveWindow.qml | 5 | ||||
| -rw-r--r-- | bar/Bar.qml | 11 | ||||
| -rw-r--r-- | config/Bar.qml | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/bar/ActiveWindow.qml b/bar/ActiveWindow.qml index 106dd8f..17d2322 100644 --- a/bar/ActiveWindow.qml +++ b/bar/ActiveWindow.qml @@ -18,7 +18,7 @@ IRect { property var activated: toplevel?.activated || false implicitWidth: activated ? rowLayout.implicitWidth + General.rectMargin * 4 : 0 - implicitHeight: rowLayout.implicitHeight + General.rectMargin * 2 + implicitHeight: rowLayout.implicitHeight + General.rectMargin * 2 + Bar.topMargin * 2 anchors.centerIn: parent color: Qt.rgba(Colors.background3.r, Colors.background3.g, Colors.background3.b, Bar.bgTransparency) @@ -26,7 +26,8 @@ IRect { // hypr toplevel.activated is always true and doesn't change either so.. opacity: activated ? 1 : 0 - radius: Style.rounding.smaller + bottomLeftRadius: Bar.moduleRadius + bottomRightRadius: Bar.moduleRadius function strip(s) { var out = s; diff --git a/bar/Bar.qml b/bar/Bar.qml index 6a3ef3d..6b762b1 100644 --- a/bar/Bar.qml +++ b/bar/Bar.qml @@ -32,9 +32,6 @@ Scope { right: parent.mid fill: parent top: parent.top - topMargin: Bar.topMargin - leftMargin: Bar.leftMargin - rightMargin: Bar.rightMargin } color: "transparent" @@ -44,10 +41,10 @@ Scope { anchors { left: parent.left } - width: leftInnerRow.width + leftInnerRow.anchors.leftMargin - leftSpacer.width + width: leftInnerRow.width + leftInnerRow.anchors.leftMargin - leftSpacer.width + Bar.leftMargin height: leftInnerRow.height color: Qt.rgba(Colors.background3.r, Colors.background3.g, Colors.background3.b, Bar.bgTransparency) - radius: Bar.moduleRadius + bottomRightRadius: Bar.moduleRadius Behavior on color { ColorAnimation { @@ -61,7 +58,7 @@ Scope { spacing: Bar.leftModuleSpacing anchors { left: parent.left - leftMargin: Bar.moduleLeftMargin + leftMargin: Bar.moduleLeftMargin + Bar.leftMargin } Workspace { @@ -96,7 +93,7 @@ Scope { width: rightInnerRow.width + rightInnerRow.anchors.rightMargin - rightSpacer.width height: rightInnerRow.height color: Qt.rgba(Colors.background3.r, Colors.background3.g, Colors.background3.b, Bar.bgTransparency) - radius: Bar.moduleRadius + bottomLeftRadius: Bar.moduleRadius RowLayout { id: rightInnerRow diff --git a/config/Bar.qml b/config/Bar.qml index 2ae9ab7..fb71776 100644 --- a/config/Bar.qml +++ b/config/Bar.qml @@ -8,8 +8,8 @@ Singleton { readonly property int height: 40 readonly property int borderRadius: Style.rounding.small readonly property int topMargin: Style.spacing.small - readonly property int leftMargin: Style.spacing.larger - readonly property int rightMargin: Style.spacing.larger + readonly property int leftMargin: Style.spacing.small + readonly property int rightMargin: Style.spacing.small readonly property int moduleLeftMargin: Style.spacing.larger readonly property int moduleRightMargin: Style.spacing.small |