Changeset 3c54869 in mainline for uspace/app/taskbar/wndlist.c

Timestamp:

2023-01-04T20:24:44Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5d86797

Parents:

cdd6fc9

Message:

Highlight active window in task bar

File:

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

uspace/app/taskbar/wndlist.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -157 +157 @@
                 if ((winfo->flags & (wndf_popup | wndf_system)) == 0) {
                         rc = wndlist_append(wndlist, wlist->windows[i],
-                            winfo->caption, false);
+                            winfo->caption, winfo->nfocus != 0, false);
                         if (rc != EOK) {
                                 wndmgt_free_window_info(winfo);
@@ -202 +202 @@
  * @param wnd_id Window ID
  * @param caption Entry caption
+ * @param active @c true iff window is active
  * @param paint @c true to paint immediately
  * @return @c EOK on success or an error code
  */
 errno_t wndlist_append(wndlist_t *wndlist, sysarg_t wnd_id,
-    const char *caption, bool paint)
+    const char *caption, bool active, bool paint)
 {
         wndlist_entry_t *entry = NULL;
@@ -230 +231 @@
 
         entry->visible = false;
+
+        ui_pbutton_set_light(entry->button, active);
 
         /* Set button callbacks */
@@ -382 +385 @@
  * @param wndlist Window list
  * @param entry Window list entry
+ * @param active @c true iff the window is active
  * @return @c EOK on success or an error code
  */
 errno_t wndlist_update(wndlist_t *wndlist, wndlist_entry_t *entry,
-    const char *caption)
+    const char *caption, bool active)
 {
         errno_t rc;
@@ -393 +397 @@
         if (rc != EOK)
                 return rc;
+
+        ui_pbutton_set_light(entry->button, active);
 
         rc = ui_pbutton_paint(entry->button);
@@ -507 +513 @@
 
         if ((winfo->flags & (wndf_popup | wndf_system)) == 0) {
-                rc = wndlist_append(wndlist, wnd_id, winfo->caption, true);
+                rc = wndlist_append(wndlist, wnd_id, winfo->caption,
+                    winfo->nfocus != 0, true);
                 if (rc != EOK) {
                         wndmgt_free_window_info(winfo);
@@ -558 +565 @@
                 return;
 
-        (void) wndlist_update(wndlist, entry, winfo->caption);
+        (void) wndlist_update(wndlist, entry, winfo->caption,
+            winfo->nfocus != 0);
         wndmgt_free_window_info(winfo);
 }