update labels display

Author: fdev31

src/wlr_layout_ui/displaywidget.py

@@ -5,12 +5,18 @@
 from pyglet.text import Label
 
 from .screens import Screen
-from .utils import Rect, brighten
+from .utils import Rect, brighten, simplify_model_name
 from .widgets import Widget
 
 ANIMATION_LENGTH = 8
 
 
+def limit_size(text):
+    if len(text) > 17:
+        return text[:14] + "..."
+    return text
+
+
 class GuiScreen(Widget):
     def __repr__(self):
         return "<Screen %s (%s) - %s>" % (self.rect, self.color, self.screen.name)
@@ -117,7 +123,7 @@ def draw(self, cursor):
         # Render the screen uid as text
         tx, ty = self.rect.center
         Label(
-            self.screen.uid,
+            limit_size(simplify_model_name(self.screen.name)),
             anchor_x="center",
             anchor_y="center",
             x=tx,
@@ -129,9 +135,9 @@ def draw(self, cursor):
         # Second caption line
         if self.screen.active:
             assert self.screen.mode
-            label = f"{self.screen.mode.width}x{self.screen.mode.height}"
+            label = f"{self.screen.mode.width}x{self.screen.mode.height}@{self.screen.mode.freq}"
             Label(
-                label,
+                self.screen.uid,
                 anchor_x="center",
                 anchor_y="center",
                 x=tx,
@@ -140,7 +146,7 @@ def draw(self, cursor):
                 bold=self.screen.active,
             ).draw()
             Label(
-                f"{self.screen.mode.freq}Hz",
+                label,
                 anchor_x="center",
                 anchor_y="center",
                 x=tx,

src/wlr_layout_ui/gui.py

@@ -20,6 +20,7 @@
 from .utils import (
     Rect,
     compute_bounding_box,
+    simplify_model_name,
     config,
     find_matching_mode,
     make_command,
@@ -29,7 +30,6 @@
 )
 from .widgets import Button, Dropdown, HBox, Style, VBox, Widget, Spacer
 
-hex_re = re.compile("^[0-9x]+$")
 
 CONFIRM_DELAY = 20
 
@@ -370,11 +370,7 @@ def get_status_text(self):
         if self.text_input is not None:
             return f'Press ENTER to validate "{self.text_input}"'
         elif self.selected_item:
-            words = []
-            for word in self.selected_item.screen.name.split():
-                if not hex_re.match(word):
-                    words.append(word)
-            return " ".join(words)
+            return simplify_model_name(self.selected_item.screen.name)
         else:
             return "Select a monitor to edit its settings"
 

src/wlr_layout_ui/utils.py

@@ -1,7 +1,18 @@
+import re
 from dataclasses import dataclass
 
 config = {"hyprland": False}
 
+hex_re = re.compile("^[0-9x]+$")
+
+
+def simplify_model_name(name):
+    words = []
+    for word in name.split():
+        if not hex_re.match(word):
+            words.append(word)
+    return " ".join(words)
+
 
 def make_command(screens, rects, wayland=True):
     if wayland and config.get("hyprland"):