Changeset 2f106b0 in mainline for uspace/app/taskbar/wndlist.c

Timestamp:

2022-11-12T20:48:05Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a5c7b865

Parents:

c48192e

Message:

Do not show window buttons that do not fit

File:

• uspace/app/taskbar/wndlist.c (modified) (4 diffs)

uspace/app/taskbar/wndlist.c

@@ -64 +64 @@
 };
 
+enum {
+        /** X distance between left edges of two consecutive buttons */
+        wndlist_button_pitch = 145,
+        /** X distance between left edges of two consecutive buttons (text) */
+        wndlist_button_pitch_text = 17,
+        /** Padding between buttons */
+        wndlist_button_pad = 5,
+        /** Padding between buttons (text) */
+        wndlist_button_pad_text = 1
+};
+
 /** Create task bar window list.
  *
@@ -91 +102 @@
 error:
         return rc;
+}
+
+/** Set window list rectangle.
+ *
+ * @param wndlist Window list
+ * @param rect Rectangle
+ */
+void wndlist_set_rect(wndlist_t *wndlist, gfx_rect_t *rect)
+{
+        wndlist->rect = *rect;
 }
 
@@ -287 +308 @@
         gfx_rect_t rect;
         ui_resource_t *res;
+        gfx_coord_t pitch;
+        gfx_coord_t pad;
         size_t idx;
 
@@ -301 +324 @@
 
         if (ui_resource_is_textmode(res)) {
-                rect.p0.x = 17 * idx + 9;
+                pitch = wndlist_button_pitch_text;
+                pad = wndlist_button_pad_text;
+        } else {
+                pitch = wndlist_button_pitch;
+                pad = wndlist_button_pad;
+        }
+
+        rect.p0.x = wndlist->rect.p0.x + pitch * idx;
+        rect.p0.y = wndlist->rect.p0.y;
+        rect.p1.x = wndlist->rect.p0.x + pitch * (idx + 1) - pad;
+        rect.p1.y = wndlist->rect.p1.y;
+
+        /* Entry does not fit? */
+        if (rect.p1.x > wndlist->rect.p1.x) {
+                /* Make entry invisible */
+                rect.p0.x = 0;
                 rect.p0.y = 0;
-                rect.p1.x = 17 * idx + 25;
-                rect.p1.y = 1;
-        } else {
-                rect.p0.x = 145 * idx + 90;
-                rect.p0.y = 4;
-                rect.p1.x = 145 * idx + 230;
-                rect.p1.y = 28;
+                rect.p1.x = 0;
+                rect.p1.y = 0;
         }