From 0596138627bd653b98624ac12e69d77bb9318a21 Mon Sep 17 00:00:00 2001 From: Arpit Chakladar Date: Wed, 23 Sep 2026 21:58:30 +0530 Subject: Revert "fix(desktop/eww): fixed the overflowing of the windows and workspaces" This reverts commit 31f0f74817a0a3fd0eb9dcd6fa192f6fc3b0a352. --- modules/desktop/eww/bar/bar.yuck | 84 +++++++++++++++++++--------------------- modules/desktop/eww/eww.scss | 27 ------------- 2 files changed, 39 insertions(+), 72 deletions(-) (limited to 'modules/desktop') diff --git a/modules/desktop/eww/bar/bar.yuck b/modules/desktop/eww/bar/bar.yuck index 31b2526..2f314ac 100644 --- a/modules/desktop/eww/bar/bar.yuck +++ b/modules/desktop/eww/bar/bar.yuck @@ -30,56 +30,50 @@ :class "bar-container" :vexpand true (workspaces-widget :workspaces "${niri_status.workspaces}") - (box :vexpand true - (windows-widget :windows "${niri_status.active_windows}")) + (windows-widget :windows "${niri_status.active_windows}") (system-widget))) (defwidget workspaces-widget [workspaces] - (scroll :hscroll false - :vscroll true - :height 250 - (box :orientation "v" - :space-evenly false - :spacing 4 - :halign "fill" - :class "workspaces" - (for ws in workspaces - (eventbox :onclick "niri msg action focus-workspace ${ws.idx}" - :cursor "pointer" - :halign "fill" - :tooltip "${ws.tooltip}" - (box :class "workspace-button ${ws.is_active ? 'active' : ''}" - :halign "fill" - (overlay :halign "fill" - (image :class "workspace-icon" - :path "${ws.icon}" - :image-width 20 - :image-height 20) - (label :class "workspace-idx" - :text "${ws.idx}" - :halign "end" - :valign "end")))))))) + (box :orientation "v" + :space-evenly false + :spacing 4 + :halign "fill" + :class "workspaces" + (for ws in workspaces + (eventbox :onclick "niri msg action focus-workspace ${ws.idx}" + :cursor "pointer" + :halign "fill" + :tooltip "${ws.tooltip}" + (box :class "workspace-button ${ws.is_active ? 'active' : ''}" + :halign "fill" + (overlay :halign "fill" + (image :class "workspace-icon" + :path "${ws.icon}" + :image-width 20 + :image-height 20) + (label :class "workspace-idx" + :text "${ws.idx}" + :halign "end" + :valign "end"))))))) (defwidget windows-widget [windows] - (scroll :hscroll false - :vscroll true - :vexpand true - (box :orientation "v" - :space-evenly false - :spacing 4 - :halign "center" - :class "windows" - (for w in windows - (eventbox :onclick "niri msg action focus-window --id ${w.id}" - :cursor "pointer" - :halign "fill" - :tooltip "${w.app_id}: ${w.title != '' ? ' ' : ''}${w.title}" - (box :halign "fill" - :class "window-button ${w.is_focused ? 'focused' : ''}" - (image :class "window-icon" - :path "${w.icon}" - :image-width 20 - :image-height 20))))))) + (box :orientation "v" + :space-evenly false + :spacing 4 + :halign "center" + :class "windows" + :vexpand true + (for w in windows + (eventbox :onclick "niri msg action focus-window --id ${w.id}" + :cursor "pointer" + :halign "fill" + :tooltip "${w.app_id}: ${w.title != '' ? ' ' : ''}${w.title}" + (box :halign "fill" + :class "window-button ${w.is_focused ? 'focused' : ''}" + (image :class "window-icon" + :path "${w.icon}" + :image-width 20 + :image-height 20)))))) (defwidget system-widget [] (box :orientation "v" diff --git a/modules/desktop/eww/eww.scss b/modules/desktop/eww/eww.scss index 8a19ffc..40ce183 100644 --- a/modules/desktop/eww/eww.scss +++ b/modules/desktop/eww/eww.scss @@ -83,30 +83,3 @@ window#eww-bar { .workspace-button.active .workspace-idx { opacity: 1; } - -scroll { - min-height: 0; -} - -scroll > box { - min-height: 0; -} - -scrollbar { - background: transparent; -} - -scrollbar slider { - background: #@@base03@@; - border-radius: 4px; - min-width: 6px; - min-height: 20px; -} - -scrollbar slider:hover { - background: #@@base05@@; -} - -scrollbar trough { - background: transparent; -} -- cgit v1.2.3