diff --git a/config/Dimensions.qml b/config/Dimensions.qml index c1dc50a..1440bc2 100644 --- a/config/Dimensions.qml +++ b/config/Dimensions.qml @@ -15,7 +15,7 @@ Singleton { component Bar: QtObject { id: bar - property int spacing: 6 + property int spacing: 8 property int border: 2 property int height: 50 property int verticalMargins: 4 @@ -28,7 +28,6 @@ Singleton { id: clock property int fontSize: 14 - property int width: 130 property int height: 30 property int horizontalPadding: 8 property int verticalPadding: 6 @@ -38,6 +37,7 @@ Singleton { id: workspace property int spacing: 5 + property int iconSize: 16 property int width: 30 property int height: 30 property int verticalPadding: 6 diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index 28a835c..40c70f7 100644 --- a/modules/bar/Bar.qml +++ b/modules/bar/Bar.qml @@ -49,6 +49,11 @@ Scope { spacing: Dimensions.bar.spacing + SystemLogo { + anchors.verticalCenter: parent.verticalCenter + implicitSize: 22 + } + Workspaces { anchors.verticalCenter: parent.verticalCenter } diff --git a/modules/bar/components/Clock.qml b/modules/bar/components/Clock.qml index fabe5cc..0912d84 100644 --- a/modules/bar/components/Clock.qml +++ b/modules/bar/components/Clock.qml @@ -7,12 +7,11 @@ import "../../../config/" Item { id: root - implicitWidth: Dimensions.clock.width + implicitWidth: childrenRect.width implicitHeight: Dimensions.clock.height StyledLabel { anchors.fill: parent - anchors.centerIn: parent } StyledText { diff --git a/modules/bar/components/SystemLogo.qml b/modules/bar/components/SystemLogo.qml new file mode 100644 index 0000000..c7bb910 --- /dev/null +++ b/modules/bar/components/SystemLogo.qml @@ -0,0 +1,6 @@ +import Quickshell +import Quickshell.Widgets + +IconImage { + source: Quickshell.iconPath("archlinux-logo") +} diff --git a/modules/bar/components/Workspace.qml b/modules/bar/components/Workspace.qml index b28e61f..05301e9 100644 --- a/modules/bar/components/Workspace.qml +++ b/modules/bar/components/Workspace.qml @@ -35,7 +35,7 @@ Item { reversible: true ColorAnimation { properties: "color" - duration: 300 + duration: 200 easing.type: Easing.InOutCubic } } @@ -66,11 +66,11 @@ Item { reversible: true ParallelAnimation { RotationAnimation { - duration: 300 + duration: 200 easing.type: Easing.InOutCubic } ColorAnimation { - duration: 300 + duration: 200 easing.type: Easing.OutCubic } }