diff --git a/Commons/KeyboardLayout.qml b/Commons/KeyboardLayout.qml index 54534bb..38d08aa 100644 --- a/Commons/KeyboardLayout.qml +++ b/Commons/KeyboardLayout.qml @@ -13,8 +13,9 @@ QtObject { "united states": "us", "us english": "us", "british": "gb", - "uk": "ua", // FIXED: Ukrainian language code should map to Ukraine - "united kingdom": "gb", + "uk": "ua", + "united kingdom"// FIXED: Ukrainian language code should map to Ukraine + : "gb", "english (uk)": "gb", "canadian": "ca", "canada": "ca", @@ -91,8 +92,9 @@ QtObject { "slovak": "sk", "slovenčina": "sk", "slovakia": "sk", - "uk": "ua", // Ukrainian language code - "ukrainian": "ua", + "uk": "ua", + "ukrainian"// Ukrainian language code + : "ua", "українська": "ua", "ukraine": "ua", "bulgarian": "bg", @@ -200,4 +202,4 @@ QtObject { "norman": "fr", "qwertz": "de" } -} \ No newline at end of file +} diff --git a/Modules/Bar/Bar.qml b/Modules/Bar/Bar.qml index 6907327..872746c 100644 --- a/Modules/Bar/Bar.qml +++ b/Modules/Bar/Bar.qml @@ -1,6 +1,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts +import Qt5Compat.GraphicalEffects import Quickshell import Quickshell.Wayland import Quickshell.Services.UPower @@ -57,7 +58,7 @@ Variants { anchors.fill: parent clip: true - // Background fill + // Background fill with shadow Rectangle { id: bar @@ -92,10 +93,10 @@ Variants { // Top section (left widgets) Column { - spacing: Style.marginXS * root.scaling + spacing: Style.marginM * root.scaling anchors.horizontalCenter: parent.horizontalCenter anchors.top: parent.top - anchors.topMargin: Style.marginS * root.scaling + anchors.topMargin: Style.marginL * root.scaling width: parent.width Repeater { @@ -117,7 +118,7 @@ Variants { // Center section (center widgets) Column { - spacing: Style.marginXS * root.scaling + spacing: Style.marginM * root.scaling anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter width: parent.width @@ -141,10 +142,10 @@ Variants { // Bottom section (right widgets) Column { - spacing: Style.marginXS * root.scaling + spacing: Style.marginM * root.scaling anchors.horizontalCenter: parent.horizontalCenter anchors.bottom: parent.bottom - anchors.bottomMargin: Style.marginS * root.scaling + anchors.bottomMargin: Style.marginL * root.scaling width: parent.width Repeater { diff --git a/Modules/Bar/Widgets/MediaMini.qml b/Modules/Bar/Widgets/MediaMini.qml index 1f8aa42..5cdf228 100644 --- a/Modules/Bar/Widgets/MediaMini.qml +++ b/Modules/Bar/Widgets/MediaMini.qml @@ -60,8 +60,8 @@ Item { return total } - implicitHeight: (barPosition === "left" || barPosition === "right") ? calculatedVerticalHeight() : Math.round(Style.barHeight * scaling) - implicitWidth: (barPosition === "left" || barPosition === "right") ? Math.round(Style.baseWidgetSize * 0.8 * scaling) : (rowLayout.implicitWidth + Style.marginM * 2 * scaling) + implicitHeight: visible ? ((barPosition === "left" || barPosition === "right") ? calculatedVerticalHeight() : Math.round(Style.barHeight * scaling)) : 0 + implicitWidth: visible ? ((barPosition === "left" || barPosition === "right") ? Math.round(Style.baseWidgetSize * 0.8 * scaling) : (rowLayout.implicitWidth + Style.marginM * 2 * scaling)) : 0 visible: MediaService.currentPlayer !== null && MediaService.canPlay diff --git a/Widgets/NHorizontalPill.qml b/Widgets/NHorizontalPill.qml index 4e50aa6..f4f7124 100644 --- a/Widgets/NHorizontalPill.qml +++ b/Widgets/NHorizontalPill.qml @@ -51,7 +51,7 @@ Item { readonly property int maxPillHeight: iconSize // For horizontal bars: height is just icon size, width includes pill space - width: revealed ? (iconSize + maxPillWidth - pillOverlap) : iconSize + width: revealed ? (openRightward ? (iconSize + maxPillWidth - pillOverlap) : (iconSize + maxPillWidth - pillOverlap)) : iconSize height: iconSize Rectangle { @@ -60,7 +60,7 @@ Item { height: revealed ? maxPillHeight : 1 // Position based on direction - center the pill relative to the icon - x: openLeftward ? (iconCircle.x + iconCircle.width / 2 - width) : (iconCircle.x + iconCircle.width / 2) + x: openLeftward ? (iconCircle.x + iconCircle.width / 2 - width) : (iconCircle.x + iconCircle.width / 2 - pillOverlap) y: 0 opacity: revealed ? Style.opacityFull : Style.opacityNone