Changeset c77cfd8 in mainline for uspace/app/taskbar/taskbar.c

Timestamp:

2022-10-04T19:55:25Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e0e612b

Parents:

3fd38b2

Message:

Proper timer cleanup, unit tests

Destroying a timer that sets itself again (i.e., runs periodically) is
a little tricky. It requires a handshake (similar to destroying a worker
thread). Realizing that this handshake works correctly is a little bit
mind boggling.

File:

• uspace/app/taskbar/taskbar.c (modified) (2 diffs)

uspace/app/taskbar/taskbar.c

@@ -92 +92 @@
         rc = ui_get_rect(taskbar->ui, &scr_rect);
         if (rc != EOK) {
-                printf("Error getting screen dimensions.\n");
-                goto error;
+                if (str_cmp(display_spec, UI_DISPLAY_NULL) != 0) {
+                        printf("Error getting screen dimensions.\n");
+                        goto error;
+                }
+
+                /* For the sake of unit tests */
+                scr_rect.p0.x = 0;
+                scr_rect.p0.y = 0;
+                scr_rect.p1.x = 100;
+                scr_rect.p1.y = 100;
         }
 
@@ -194 +202 @@
 void taskbar_destroy(taskbar_t *taskbar)
 {
+        ui_fixed_remove(taskbar->fixed,  taskbar_clock_ctl(taskbar->clock));
         taskbar_clock_destroy(taskbar->clock);
         ui_window_destroy(taskbar->window);