Changeset 9a664b6d in mainline

Timestamp:

2024-06-29T18:44:23Z (5 days ago)

Author:

Mohammed Q. Hussain <maastaar@…>

Children:

a3086a4

Parents:

8eeffc1

Message:

Use windows flag to determine if the taskbar should minimize or maximize a window

Location:

uspace/app/taskbar

Files:

• types/wndlist.h (modified) (1 diff)
• wndlist.c (modified) (2 diffs)

uspace/app/taskbar/types/wndlist.h

@@ -59 +59 @@
         /** Window button rectangle */
         gfx_rect_t rect;
-        /** Window maximized **/
-        bool maximized;
 } wndlist_entry_t;
 

uspace/app/taskbar/wndlist.c

@@ -232 +232 @@
 
         entry->visible = false;
-        entry->maximized = true;
 
         ui_pbutton_set_light(entry->button, active);
@@ -718 +717 @@
 {
         wndlist_entry_t *entry = (wndlist_entry_t *)arg;
+        wndmgt_window_info_t *winfo = NULL;
         sysarg_t dev_id;
+        errno_t rc;
+        bool minimized = false;
 
         /* ID of device that clicked the button */
         dev_id = entry->wndlist->ev_idev_id;
 
-        if (!entry->maximized) {
+        rc = wndmgt_get_window_info(entry->wndlist->wndmgt,
+            entry->wnd_id, &winfo);
+        if (rc == EOK) {
+                minimized = (winfo->flags & wndf_minimized) == 0;
+        }
+
+        if (!minimized) {
                 (void) wndmgt_activate_window(entry->wndlist->wndmgt,
                 dev_id, entry->wnd_id);
-
-                entry->maximized = true;
         } else {
                 (void) wndmgt_deactivate_window(entry->wndlist->wndmgt,
                 dev_id, entry->wnd_id);
-
-                entry->maximized = false;
         }
 }