rework labels

Author: fdev31

src/wlr_layout_ui/displaywidget.py

@@ -1,6 +1,5 @@
 import random
 
-import pyglet
 from pyglet.shapes import BorderedRectangle
 from pyglet.text import Label
 
@@ -12,8 +11,8 @@
 
 
 def limit_size(text):
-    if len(text) > 17:
-        return text[:14] + "..."
+    if len(text) > 15:
+        return text[:12] + "..."
     return text
 
 
@@ -135,7 +134,7 @@ 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}@{self.screen.mode.freq}"
+            label = f"{self.screen.mode.width}x{self.screen.mode.height}@{int(self.screen.mode.freq)}"
             Label(
                 self.screen.uid,
                 anchor_x="center",

src/wlr_layout_ui/gui.py

@@ -141,23 +141,24 @@ def __init__(self, width, height):
             # invert=True,
         )
 
+        ref_rect.width = but_w
         self.rotation = Dropdown(
             ref_rect.copy(),
-            label="Rotation",
+            label="Transform",
             options=[
-                {"name": "0", "value": 0},
-                {"name": "90", "value": 1},
-                {"name": "180", "value": 2},
-                {"name": "270", "value": 3},
+                {"name": "original", "value": 0},
+                {"name": "rot 90°", "value": 1},
+                {"name": "rot 180°", "value": 2},
+                {"name": "rot 270°", "value": 3},
                 {"name": "flip", "value": 4},
-                {"name": "flip 90", "value": 5},
-                {"name": "flip 180", "value": 6},
-                {"name": "flip 270", "value": 7},
+                {"name": "rot 90° flip", "value": 5},
+                {"name": "rot 180° flip", "value": 6},
+                {"name": "rot 270° flip", "value": 7},
             ],
             onchange=self.action_update_rotation,
             # invert=True,
         )
-        ref_rect.width = int(ref_rect.width * 0.8)
+        ref_rect.width = but_w // 1.5
         self.scale_ratio = Dropdown(
             ref_rect.copy(),
             label="Scale",

src/wlr_layout_ui/utils.py

@@ -11,6 +11,8 @@ def simplify_model_name(name):
     for word in name.split():
         if not hex_re.match(word):
             words.append(word)
+    # remove duplicate words keeping order (comparing lowercase)
+    words = list(dict.fromkeys(words))
     return " ".join(words)