Changeset a3086a4 in mainline for uspace/app/taskbar/wndlist.c

Timestamp:

2024-06-29T18:46:37Z (5 days ago)

Author:

GitHub <noreply@…>

Parents:

e3997a8 (diff), 9a664b6d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Mohammed Q. Hussain <maastaar@…> (2024-06-29 18:46:37)

git-committer:

GitHub <noreply@…> (2024-06-29 18:46:37)

Message:

Merge 9a664b6dd10624fd8da3c9a74ecc75ab40ba4863 into e3997a897c134db63e3b799a0b3885fb90fd2731

File:

• uspace/app/taskbar/wndlist.c (modified) (1 diff)

uspace/app/taskbar/wndlist.c

@@ -717 +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;
 
-        (void) wndmgt_activate_window(entry->wndlist->wndmgt,
-            dev_id, entry->wnd_id);
+        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);
+        } else {
+                (void) wndmgt_deactivate_window(entry->wndlist->wndmgt,
+                dev_id, entry->wnd_id);
+        }
 }