Changeset 6e91475 in mainline for uspace/app/taskbar/wndlist.c

Timestamp:

2022-11-19T17:46:27Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

68d68e9

Parents:

d19d15b

Message:

I can see an invisible button in the task bar

Who're you gonna call?

File:

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

uspace/app/taskbar/wndlist.c

@@ -215 +215 @@
         list_append(&entry->lentries, &wndlist->entries);
 
-        /* Set the button rectangle */
+        entry->visible = false;
+
+        /* Set the button rectangle and add it to layout, if applicable */
         wndlist_set_entry_rect(wndlist, entry);
 
@@ -221 +223 @@
         ui_pbutton_set_cb(entry->button, &wndlist_button_cb, (void *)entry);
 
-        rc = ui_fixed_add(wndlist->fixed, ui_pbutton_ctl(entry->button));
-        if (rc != EOK)
-                goto error;
-
-        if (paint) {
+        if (paint && entry->visible) {
                 rc = ui_pbutton_paint(entry->button);
                 if (rc != EOK)
@@ -339 +337 @@
         if (rect.p1.x > wndlist->rect.p1.x) {
                 /* Make entry invisible */
-                rect.p0.x = 0;
-                rect.p0.y = 0;
-                rect.p1.x = 0;
-                rect.p1.y = 0;
+                if (entry->visible) {
+                        ui_fixed_remove(wndlist->fixed,
+                            ui_pbutton_ctl(entry->button));
+                        entry->visible = false;
+                }
+        } else {
+                /* Make entry visible */
+                if (!entry->visible) {
+                        ui_fixed_add(wndlist->fixed,
+                            ui_pbutton_ctl(entry->button));
+                        entry->visible = true;
+                }
         }