eww: syswin layout change

This commit is contained in:
soraefir 2023-11-21 20:33:19 +01:00
parent c58f0dceda
commit 66bb6d3d6b
3 changed files with 47 additions and 44 deletions

View File

@ -30,7 +30,9 @@ color: $base0B;
font-weight: 900; font-weight: 900;
} }
.cpu-core-usage, .gpu-core-usage {
.cpu-core-usage, .gpu-core-usage, .memory-usage {
background-color: $bg0; background-color: $bg0;
border-radius: $border-radius; border-radius: $border-radius;
padding: 2pt; padding: 2pt;
@ -38,26 +40,34 @@ color: $base0B;
} }
.cpu-core-usage trough *, .gpu-core-usage trough * { .cpu-core-usage trough * {
background-color: $base0C; background-color: $base0C;
border-radius: $border-radius; border-radius: $border-radius;
padding: 2pt; padding: 2pt;
} }
.gpu-core-usage trough * {
background-color: $base0E;
border-radius: $border-radius;
padding: 2pt;
}
.memory-usage trough * {
background-color: $base08;
border-radius: $border-radius;
padding: 2pt;
}
.spacer { .spacer {
color: $bg1; color: $bg1;
padding: $gaps-window; padding: $gaps-window;
margin:0;
} }
.sys-win { .sys-win {
margin: $gaps-screen;
}
.sys-win-sub {
@include window; @include window;
background-color: $bg1; background-color: $bg1;
color: $fg; color: $fg;
margin: $gaps-screen;
padding: .5em; padding: .5em;
margin: $gaps-window;
} }

View File

@ -66,13 +66,7 @@ tooltip {
margin: $gaps-screen 0; margin: $gaps-screen 0;
} }
scale trough {
background-color: $bg1;
border-radius: 24px;
margin: 0 1rem;
min-height: 10px;
min-width: 70px;
}
.grey { .grey {
background-color: $base02; background-color: $base02;

View File

@ -1,16 +1,18 @@
(defwidget cpu-sys-win [] (defwidget cpu-sys-win []
(box (box
:orientation "v"
:space-evenly false :space-evenly false
:class "sys-win-sub"
(box (box
:orientation "v"
(for core in {EWW_CPU.cores} (for core in {EWW_CPU.cores}
(box (box
:space-evenly false :space-evenly false
:class "cpu-core ${core.core}" :class "cpu-core ${core.core}"
(progress (progress
:value {core.usage} :value {core.usage}
:orientation "v" :orientation "h"
:flipped true :flipped true
:class "cpu-core-usage" :class "cpu-core-usage"
:tooltip "core${core.core} @ ${core.freq}Mhz" :tooltip "core${core.core} @ ${core.freq}Mhz"
@ -18,68 +20,60 @@
) )
) )
) )
(box :class "spacer" "")
(progress
:value {100*memory.used/memory.total}
:orientation "v"
:flipped true
:class "gpu-core-usage"
:tooltip "RAM"
)
) )
) )
(defwidget gpu-sys-win [] (defwidget gpu-sys-win []
(box (box
:orientation "v"
:space-evenly false :space-evenly false
:class "sys-win-sub"
(progress (progress
:value {gpu.devices[0].GRBM2.CommandProcessor-Compute.value} :value {gpu.devices[0].GRBM2.CommandProcessor-Compute.value}
:orientation "v" :orientation "h"
:flipped true :flipped true
:class "gpu-core-usage" :class "gpu-core-usage"
:tooltip "Compute" :tooltip "Compute"
) )
(progress (progress
:value {gpu.devices[0].GRBM2.CommandProcessor-Fetcher.value} :value {gpu.devices[0].GRBM2.CommandProcessor-Fetcher.value}
:orientation "v" :orientation "h"
:flipped true :flipped true
:class "gpu-core-usage" :class "gpu-core-usage"
:tooltip "Fetcher" :tooltip "Fetcher"
) )
(progress (progress
:value {gpu.devices[0].GRBM2.CommandProcessor-Graphics.value} :value {gpu.devices[0].GRBM2.CommandProcessor-Graphics.value}
:orientation "v" :orientation "h"
:flipped true :flipped true
:class "gpu-core-usage" :class "gpu-core-usage"
:tooltip "Graphics" :tooltip "Graphics"
) )
(box :class "spacer" "") (box :class "spacer")
(progress (progress
:value {gpu.devices[0].gpu_activity.GFX.value} :value {gpu.devices[0].gpu_activity.GFX.value}
:orientation "v" :orientation "h"
:flipped true :flipped true
:class "gpu-core-usage" :class "gpu-core-usage"
:tooltip "GFX" :tooltip "GFX"
) )
(progress (progress
:value {gpu.devices[0].gpu_activity.Memory.value} :value {gpu.devices[0].gpu_activity.Memory.value}
:orientation "v" :orientation "h"
:flipped true :flipped true
:class "gpu-core-usage" :class "gpu-core-usage"
:tooltip "Memory" :tooltip "Memory"
) )
(progress (progress
:value {gpu.devices[0].gpu_activity.MediaEngine.value} :value {gpu.devices[0].gpu_activity.MediaEngine.value}
:orientation "v" :orientation "h"
:flipped true :flipped true
:class "gpu-core-usage" :class "gpu-core-usage"
:tooltip "Media" :tooltip "Media"
) )
(box :class "spacer" "") (box :class "spacer")
(progress (progress
:value {100*gpu.devices[0].VRAM.TotalVRAMUsage.value/gpu.devices[0].VRAM.TotalVRAM.value} :value {100*gpu.devices[0].VRAM.TotalVRAMUsage.value/gpu.devices[0].VRAM.TotalVRAM.value}
:orientation "v" :orientation "h"
:flipped true :flipped true
:class "gpu-core-usage" :class "gpu-core-usage"
:tooltip "VRAM" :tooltip "VRAM"
@ -90,23 +84,28 @@
(defwidget ram-sys-win [] (defwidget ram-sys-win []
(box (box
:space-evenly false :space-evenly false
:class "sys-win-sub" (progress
:value {100*memory.used/memory.total}
:orientation "h"
:flipped true
:class "memory-usage"
:tooltip "RAM"
)
) )
) )
(defwidget sys-win [] (defwidget sys-win []
(box (box
:class "sys-win" :class "sys-win"
:space-evenly false :space-evenly false
:orientation "v" :orientation "v"
(box (cpu-sys-win)
:space-evenly false (box :class "spacer")
:orientation "h" (box :class "spacer")
(cpu-sys-win) (gpu-sys-win)
(gpu-sys-win) (box :class "spacer")
) (box :class "spacer")
(ram-sys-win)
) )
) )