From: sbkelley Date: Sun, 7 Dec 2025 21:01:13 +0000 (-0500) Subject: Update layout X-Git-Url: https://skyeroc.xyz/gitweb/?a=commitdiff_plain;h=514d6486368a09cf0d9f16198c15e7be4f4ab145;p=obs-ctl Update layout --- diff --git a/src/obs_ctl/data/default_layout.tcss b/src/obs_ctl/data/default_layout.tcss index eb8f7e4..b722764 100644 --- a/src/obs_ctl/data/default_layout.tcss +++ b/src/obs_ctl/data/default_layout.tcss @@ -19,16 +19,17 @@ min-width:80; max-width:125; min-height:15; - max-height:38; + max-height:42; height:auto; /** --------------------------------------- */ #top_block { /** HorizontalGroup */ min-height:7; - height:11fr; + max-height:18; + height:18fr; RecordControls { /** Scrollable Container OVERRIDDEN */ min-width:24; max-width:42; - width:48fr; + width:42fr; min-height:7; max-height:13; scrollbar-gutter:stable; @@ -40,8 +41,9 @@ SettingsBlock { /** Container */ min-width:56; max-width:85; - width:85fr; + width:56fr; min-height:7; + max-height:18; .obs_settings_pane--content { /** probably belongs as default_css for obssettings */ grid-size:2 1; grid-columns:16 1fr; @@ -51,13 +53,25 @@ } #bottom_block{ min-width:80; - min-height:8; - height:8fr; + min-height:10; + height:10fr; + max-height:24; StatsDisplay { /** StatsDisplay (ScrollableContainer) OVERRIDDEN */ - min-height:8; + min-height:10; + max-height:26; .stats_display--content { /** Grid */ - min-height:8; - max-height:12; + background:red; + grid-rows:10fr 6fr; + min-height:10; + max-height:14; + .stats_display--top { + min-height:4; + max-height:6; + } + .stats_display--bottom { + min-height:6; + max-height:8; + } } } } diff --git a/src/obs_ctl/interface/molecule/stats_display.py b/src/obs_ctl/interface/molecule/stats_display.py index 56b9db5..30b89e3 100644 --- a/src/obs_ctl/interface/molecule/stats_display.py +++ b/src/obs_ctl/interface/molecule/stats_display.py @@ -22,14 +22,17 @@ class StatsDisplay(ScrollableContainer): align:center middle; .stats_display--content { /** Grid */ grid-size:12; + grid-rows:2fr 4fr; min-width:66; max-width:120; min-height:4; max-height:8; .stats_display--top { /** TextReadout */ + min-height:2; column-span:3; } .stats_display--bottom { /** TextReadout */ + min-height:2; column-span:4; } TextReadout { /** Container */ @@ -60,13 +63,13 @@ class StatsDisplay(ScrollableContainer): def compose(self): with Grid(classes="stats_display--content"): + yield TextReadout("Netwrk frames dropped", "-/- (-.-%)", id="dropped_net", classes="stats_display--dropped_net stats_display--bottom") + yield TextReadout("Render frames dropped", "-/- (-.-%)", id="dropped_ren", classes="stats_display--dropped_ren stats_display--bottom") + yield TextReadout("Encdng frames dropped", "-/- (-.-%)", id="dropped_enc", classes="stats_display--dropped_enc stats_display--bottom") yield TextReadout("CPU Usage", "-.-%", id="cpu", classes="stats_display--cpu stats_display--top") yield TextReadout("RAM Usage", "-b", id="ram", classes="stats_display--ram stats_display--top") yield TextReadout("ETA (disk)", "N/A", id="hdd", classes="stats_display--hdd stats_display--top") yield TextReadout("FPS", "--.--", id="fps", classes="stats_display-fps stats_display--top") - yield TextReadout("Netwrk frames dropped", "-/- (-.-%)", id="dropped_net", classes="stats_display--dropped_net stats_display--bottom") - yield TextReadout("Render frames dropped", "-/- (-.-%)", id="dropped_ren", classes="stats_display--dropped_ren stats_display--bottom") - yield TextReadout("Encdng frames dropped", "-/- (-.-%)", id="dropped_enc", classes="stats_display--dropped_enc stats_display--bottom") def update_text_readouts(self, obs_stats: obs.OBSStats):