diff --git a/.config/quickshell/modules/bar/ActiveWindow.qml b/.config/quickshell/modules/bar/ActiveWindow.qml index 446bdb07f..574cdb8c6 100644 --- a/.config/quickshell/modules/bar/ActiveWindow.qml +++ b/.config/quickshell/modules/bar/ActiveWindow.qml @@ -12,7 +12,6 @@ Item { height: parent.height width: colLayout.width - Layout.leftMargin: Appearance.rounding.screenRounding ColumnLayout { diff --git a/.config/quickshell/modules/bar/Bar.qml b/.config/quickshell/modules/bar/Bar.qml index b71cdc401..8582d5486 100644 --- a/.config/quickshell/modules/bar/Bar.qml +++ b/.config/quickshell/modules/bar/Bar.qml @@ -1,9 +1,11 @@ +import "root:/" import "root:/modules/common" import "root:/modules/common/widgets" import "root:/services" import QtQuick import QtQuick.Controls import QtQuick.Layouts +import Qt5Compat.GraphicalEffects import Quickshell import Quickshell.Hyprland import Quickshell.Io @@ -51,6 +53,34 @@ Scope { anchors.left: parent.left implicitHeight: barHeight width: (barRoot.width - middleSection.width) / 2 + spacing: 10 + + Rectangle { + Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter + Layout.leftMargin: Appearance.rounding.screenRounding + Layout.fillWidth: false + + // Layout.fillHeight: true + radius: Appearance.rounding.full + color: (barLeftSideMouseArea.pressed || GlobalStates.sidebarLeftOpenCount > 0) ? Appearance.colors.colLayer1Active : barLeftSideMouseArea.hovered ? Appearance.colors.colLayer1Hover : "transparent" + implicitWidth: distroIcon.width + 5*2 + implicitHeight: distroIcon.height + 5*2 + + CustomIcon { + id: distroIcon + anchors.centerIn: parent + width: 19.5 + height: 19.5 + source: ConfigOptions.bar.topLeftIcon == 'distro' ? + SystemInfo.distroIcon : "google-gemini-symbolic" + + } + ColorOverlay { + anchors.fill: distroIcon + source: distroIcon + color: Appearance.colors.colOnLayer0 + } + } ActiveWindow { Layout.fillWidth: true @@ -124,11 +154,11 @@ Scope { Layout.margins: 4 Layout.rightMargin: Appearance.rounding.screenRounding Layout.fillHeight: true - implicitWidth: rowLayout.implicitWidth + 10*2 + implicitWidth: indicatorsRowLayout.implicitWidth + 10*2 radius: Appearance.rounding.full - color: barRightSideMouseArea.pressed ? Appearance.colors.colLayer1Active : barRightSideMouseArea.hovered ? Appearance.colors.colLayer1Hover : "transparent" + color: (barRightSideMouseArea.pressed || GlobalStates.sidebarRightOpenCount > 0) ? Appearance.colors.colLayer1Active : barRightSideMouseArea.hovered ? Appearance.colors.colLayer1Hover : "transparent" RowLayout { - id: rowLayout + id: indicatorsRowLayout anchors.centerIn: parent spacing: 15 diff --git a/.config/quickshell/modules/common/ConfigOptions.qml b/.config/quickshell/modules/common/ConfigOptions.qml index 19a374d1c..f9434de60 100644 --- a/.config/quickshell/modules/common/ConfigOptions.qml +++ b/.config/quickshell/modules/common/ConfigOptions.qml @@ -19,6 +19,7 @@ Singleton { property QtObject bar: QtObject { property int batteryLowThreshold: 20 + property string topLeftIcon: "gemini" // Options: distro, gemini property QtObject resources: QtObject { property bool alwaysShowSwap: true property bool alwaysShowCpu: false