Changeset 68d68e9 in mainline

Timestamp:

2022-11-23T12:50:27Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c4a53280

Parents:

6e91475

Message:

Vary window button size to fit

If they get too narrow, we stop adding more buttons.

Location:

uspace

Files:

• app/taskbar/test/wndlist.c (modified) (1 diff)
• app/taskbar/wndlist.c (modified) (8 diffs)
• app/taskbar/wndlist.h (modified) (2 diffs)
• lib/ui/src/pbutton.c (modified) (5 diffs)

uspace/app/taskbar/test/wndlist.c

@@ -407 +407 @@
 }
 
+/** Test wndlist_count() */
+PCUT_TEST(count)
+{
+        errno_t rc;
+        ui_t *ui = NULL;
+        ui_wnd_params_t params;
+        ui_window_t *window = NULL;
+        ui_fixed_t *fixed = NULL;
+        wndlist_t *wndlist;
+        size_t count;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Hello";
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(window);
+
+        rc = ui_fixed_create(&fixed);
+        ui_window_add(window, ui_fixed_ctl(fixed));
+
+        rc = wndlist_create(window, fixed, &wndlist);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        count = wndlist_count(wndlist);
+        PCUT_ASSERT_INT_EQUALS(0, count);
+
+        rc = wndlist_append(wndlist, 1, "Foo", true);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        count = wndlist_count(wndlist);
+        PCUT_ASSERT_INT_EQUALS(1, count);
+
+        rc = wndlist_append(wndlist, 2, "Bar", true);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        count = wndlist_count(wndlist);
+        PCUT_ASSERT_INT_EQUALS(2, count);
+
+        wndlist_destroy(wndlist);
+
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
 /** Test repainting window list */
 PCUT_TEST(repaint)

uspace/app/taskbar/wndlist.c

@@ -35 +35 @@
 #include <gfx/coord.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -65 +66 @@
 
 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,
+        /** Min. X distance between left edges of two consecutive buttons */
+        wndlist_button_pitch_min = 85,
+        /** Max. X distance between left edges of two consecutive buttons (text) */
+        wndlist_button_pitch_min_text = 10,
+        /** Min. X distance between left edges of two consecutive buttons */
+        wndlist_button_pitch_max = 165,
+        /** Max. X distance between left edges of two consecutive buttons (text) */
+        wndlist_button_pitch_max_text = 17,
         /** Padding between buttons */
         wndlist_button_pad = 5,
@@ -197 +202 @@
         wndlist_entry_t *entry = NULL;
         ui_resource_t *res;
+        wndlist_entry_t *e;
         errno_t rc;
 
@@ -217 +223 @@
         entry->visible = false;
 
-        /* Set the button rectangle and add it to layout, if applicable */
-        wndlist_set_entry_rect(wndlist, entry);
+        /*
+         * Update rectangles for all entries, including @a entry, adding
+         * it to the layout, if applicable.
+         */
+        e = wndlist_first(wndlist);
+        while (e != NULL) {
+                wndlist_set_entry_rect(wndlist, e);
+                e = wndlist_next(e);
+        }
 
         /* Set button callbacks */
         ui_pbutton_set_cb(entry->button, &wndlist_button_cb, (void *)entry);
 
-        if (paint && entry->visible) {
-                rc = ui_pbutton_paint(entry->button);
-                if (rc != EOK)
-                        goto error;
-        }
+        if (paint)
+                return wndlist_repaint(wndlist);
 
         return EOK;
@@ -249 +259 @@
     bool paint)
 {
-        wndlist_entry_t *next;
+        wndlist_entry_t *e;
         assert(entry->wndlist == wndlist);
 
-        next = wndlist_next(entry);
-
-        ui_fixed_remove(wndlist->fixed, ui_pbutton_ctl(entry->button));
+        if (entry->visible)
+                ui_fixed_remove(wndlist->fixed, ui_pbutton_ctl(entry->button));
         ui_pbutton_destroy(entry->button);
         list_remove(&entry->lentries);
         free(entry);
 
-        /* Update positions of the remaining entries */
-        while (next != NULL) {
-                wndlist_set_entry_rect(wndlist, next);
-                next = wndlist_next(next);
+        /* Update positions of the all entries */
+        e = wndlist_first(wndlist);
+        while (e != NULL) {
+                wndlist_set_entry_rect(wndlist, e);
+                e = wndlist_next(e);
         }
 
@@ -307 +317 @@
         ui_resource_t *res;
         gfx_coord_t pitch;
+        gfx_coord_t pitch_max;
+        gfx_coord_t pitch_min;
         gfx_coord_t pad;
         size_t idx;
+        size_t nbuttons;
 
         /* Determine entry index */
@@ -322 +335 @@
 
         if (ui_resource_is_textmode(res)) {
-                pitch = wndlist_button_pitch_text;
+                pitch_max = wndlist_button_pitch_max_text;
+                pitch_min = wndlist_button_pitch_min_text;
                 pad = wndlist_button_pad_text;
         } else {
-                pitch = wndlist_button_pitch;
+                pitch_max = wndlist_button_pitch_max;
+                pitch_min = wndlist_button_pitch_min;
                 pad = wndlist_button_pad;
         }
+
+        /* Compute pitch that fits all buttons perfectly */
+        nbuttons = wndlist_count(wndlist);
+        pitch = (wndlist->rect.p1.x - wndlist->rect.p0.x + pad) / nbuttons;
+        if (pitch < pitch_min)
+                pitch = pitch_min;
+        if (pitch > pitch_max)
+                pitch = pitch_max;
 
         rect.p0.x = wndlist->rect.p0.x + pitch * idx;
@@ -478 +501 @@
 }
 
+/** Get number of window list entries.
+ *
+ * @param wndlist Window list
+ * @return Number of entries
+ */
+size_t wndlist_count(wndlist_t *wndlist)
+{
+        return list_count(&wndlist->entries);
+}
+
 /** Repaint window list.
  *

uspace/app/taskbar/wndlist.h

@@ -40 +40 @@
 #include <gfx/coord.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <ui/fixed.h>
 #include <ui/window.h>
@@ -56 +57 @@
 extern wndlist_entry_t *wndlist_first(wndlist_t *);
 extern wndlist_entry_t *wndlist_next(wndlist_entry_t *);
+extern size_t wndlist_count(wndlist_t *);
 extern errno_t wndlist_repaint(wndlist_t *);
 

uspace/lib/ui/src/pbutton.c

@@ -54 +54 @@
 enum {
         ui_pb_press_dx = 1,
-        ui_pb_press_dy = 1
+        ui_pb_press_dy = 1,
+        ui_pb_pad_x = 2,
+        ui_pb_pad_x_text = 1
 };
 
@@ -323 +325 @@
         gfx_text_fmt_t fmt;
         gfx_rect_t rect;
+        gfx_rect_t irect;
         gfx_coord_t thickness;
         bool depressed;
@@ -360 +363 @@
         } else {
                 /* Text decoration */
+                ui_paint_get_inset_frame_inside(pbutton->res, &rect, &irect);
                 gfx_text_fmt_init(&fmt);
                 fmt.font = pbutton->res->font;
@@ -365 +369 @@
                 fmt.halign = gfx_halign_center;
                 fmt.valign = gfx_valign_center;
+                fmt.abbreviate = true;
+                fmt.width = irect.p1.x - irect.p0.x - 2 * ui_pb_pad_x;
 
                 rc = gfx_puttext(&pos, &fmt, pbutton->caption);
@@ -442 +448 @@
         fmt.halign = gfx_halign_center;
         fmt.valign = gfx_valign_center;
+        fmt.abbreviate = true;
+        fmt.width = rect.p1.x - rect.p0.x - 2 * ui_pb_pad_x_text;
 
         rc = gfx_puttext(&pos, &fmt, pbutton->caption);