From 980058a2f058ac0d876227880bea6c17151d8b31 Mon Sep 17 00:00:00 2001 From: Honney Date: Sun, 14 Jun 2026 01:15:30 +0200 Subject: [PATCH] fixed small things --- install.sh | 14 +++----------- modules/bar/widgets/Battery.qml | 2 +- modules/bar/widgets/MenuButton.qml | 2 +- modules/bar/widgets/Network.qml | 2 +- modules/bar/widgets/PowerButton.qml | 2 +- modules/bar/widgets/Tray.qml | 4 +++- modules/bar/widgets/Workspaces.qml | 4 ++-- 7 files changed, 12 insertions(+), 18 deletions(-) diff --git a/install.sh b/install.sh index 1a1ad5a..2237d30 100755 --- a/install.sh +++ b/install.sh @@ -93,16 +93,16 @@ transform_svg_white \ # ---------------------------- echo info "Preparing global icons..." -mkdir -p "$SCRIPT_DIR/colors/icons" +mkdir -p "$SCRIPT_DIR/modules/jl/assets" download \ "https://raw.githubusercontent.com/Tekh-ops/Garuda-Linux-Icons/refs/heads/master/actions/scalable/window-close.svg" \ - "$SCRIPT_DIR/colors/icons/wrong.svg" \ + "$SCRIPT_DIR/modules/jl/assets/wrong.svg" \ "wrong.svg" download \ "https://raw.githubusercontent.com/Tekh-ops/Garuda-Linux-Icons/refs/heads/master/actions/scalable/dialog-ok-apply.svg" \ - "$SCRIPT_DIR/colors/icons/correct.svg" \ + "$SCRIPT_DIR/modules/jl/assets/correct.svg" \ "correct.svg" # ---------------------------- @@ -179,13 +179,5 @@ info "Creating Wallpaper Folder Config" cp "$SCRIPT_DIR/config/path/WallpaperPath.qml.template" "$SCRIPT_DIR/config/path/WallpaperPath.qml" sed -i "s|__CONFIG_DIR__|$WALLPAPER_DIR|g" "$SCRIPT_DIR/config/path/WallpaperPath.qml" -# 5. Ensure it exists -mkdir -p "$WALLPAPER_DIR" - -info "Copying example Wallpaper..." - -# 6. Copy example wallpaper -cp $SCRIPT_DIR/colors/example_background.png "$WALLPAPER_DIR/japan_old_emperor_stream_with_bridge.png" - echo ok "All assets prepared successfully." \ No newline at end of file diff --git a/modules/bar/widgets/Battery.qml b/modules/bar/widgets/Battery.qml index ec93872..eb624c8 100644 --- a/modules/bar/widgets/Battery.qml +++ b/modules/bar/widgets/Battery.qml @@ -18,7 +18,7 @@ MouseArea { Rectangle { anchors.fill: parent color: batteryButton.containsMouse ? Colors.tertiary : Qt.alpha(Colors.tertiaryContainer, 0.25) - radius: Config.radius + radius: Config.radius_fun(batteryButton.height) border.width: Config.border_width border.color: batteryButton.containsMouse ? Colors.tertiaryContainer_fg : Colors.secondaryContainer_fg diff --git a/modules/bar/widgets/MenuButton.qml b/modules/bar/widgets/MenuButton.qml index 9c9b76b..db129bd 100644 --- a/modules/bar/widgets/MenuButton.qml +++ b/modules/bar/widgets/MenuButton.qml @@ -17,7 +17,7 @@ MouseArea { Rectangle { anchors.fill: parent color: menuButton.containsMouse ? Colors.secondaryContainer_fg : Qt.alpha(Colors.secondary, 0.75) - radius: Config.radius + radius: Config.radius_fun(menuButton.height) border.width: 0 Text { diff --git a/modules/bar/widgets/Network.qml b/modules/bar/widgets/Network.qml index 6138ddb..8254929 100644 --- a/modules/bar/widgets/Network.qml +++ b/modules/bar/widgets/Network.qml @@ -19,7 +19,7 @@ MouseArea { Rectangle { anchors.fill: parent color: networkButton.containsMouse ? Colors.tertiary : Qt.alpha(Colors.tertiaryContainer, 0.25) - radius: Config.radius + radius: Config.radius_fun(networkButton.height) border.width: Config.border_width border.color: networkButton.containsMouse ? Colors.tertiaryContainer_fg : Colors.secondaryContainer_fg diff --git a/modules/bar/widgets/PowerButton.qml b/modules/bar/widgets/PowerButton.qml index 3a49667..b486c49 100644 --- a/modules/bar/widgets/PowerButton.qml +++ b/modules/bar/widgets/PowerButton.qml @@ -17,7 +17,7 @@ MouseArea { Rectangle { anchors.fill: parent color: powerButton.containsMouse ? Colors.secondaryContainer_fg : Qt.alpha(Colors.secondary, 0.75) - radius: Config.radius + radius: Config.radius_fun(powerButton.height) border.width: 0 Text { diff --git a/modules/bar/widgets/Tray.qml b/modules/bar/widgets/Tray.qml index 866bd45..1a2e728 100644 --- a/modules/bar/widgets/Tray.qml +++ b/modules/bar/widgets/Tray.qml @@ -21,11 +21,13 @@ Row { // Workspace Row id: trayItem width: iconImage.width + Config.spacing_fun(bar.height) height: iconImage.height + Config.spacing_fun(bar.height) - radius: Config.small_radius_fun(height) + radius: Config.radius_fun(trayRow.height) color: trayArea.containsMouse ? Colors.tertiaryContainer : modelData.active ? Colors.primaryContainer : Colors.secondaryContainer border.width: Config.border_width + border.color: trayArea.containsMouse ? Colors.tertiaryContainer_fg + : Colors.secondaryContainer_fg Process { id: steamRunner diff --git a/modules/bar/widgets/Workspaces.qml b/modules/bar/widgets/Workspaces.qml index 8a03d39..ac43346 100644 --- a/modules/bar/widgets/Workspaces.qml +++ b/modules/bar/widgets/Workspaces.qml @@ -21,8 +21,8 @@ Row { width: { var cw = wsNum.width if (wsIconsRow.children.length > 0) - cw += Config.spacing_fun(workspacesRow.height) + wsIconsRow.width - Math.max(cw + Config.spacing_fun(workspacesRow.height), wsNum.height + Config.spacing_fun(workspacesRow.height)) + cw += Config.spacing_fun(bar.height) + wsIconsRow.width + Math.max(cw + Config.spacing_fun(bar.height)*2, wsNum.height + Config.spacing_fun(bar.height)*2) } height: wsNum.height + Config.spacing_fun(wsNum.height) radius: Config.radius_fun(height)