Changeset c48192e in mainline

Timestamp:

2022-11-09T20:56:24Z (18 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2f106b0

Parents:

68704ab

Message:

Prevent task bar from being listed in task bar

Location:

uspace

Files:

• app/taskbar/taskbar.c (modified) (1 diff)
• app/taskbar/wndlist.c (modified) (2 diffs)
• lib/display/include/types/display/wndparams.h (modified) (1 diff)
• lib/ui/include/types/ui/window.h (modified) (1 diff)
• lib/ui/src/window.c (modified) (1 diff)

uspace/app/taskbar/taskbar.c

@@ -130 +130 @@
         params.caption = "Task Bar";
         params.placement = ui_wnd_place_bottom_left;
+
+        /* Window has no titlebar */
         params.style &= ~ui_wds_titlebar;
+
+        /* Prevent taskbar window from being listed in taskbar */
+        params.flags |= ui_wndf_system;
 
         params.rect.p0.x = 0;

uspace/app/taskbar/wndlist.c

@@ -121 +121 @@
                         goto error;
 
-                if ((winfo->flags & wndf_popup) == 0) {
+                if ((winfo->flags & (wndf_popup | wndf_system)) == 0) {
                         rc = wndlist_append(wndlist, wlist->windows[i],
                             winfo->caption, false);
@@ -330 +330 @@
                 goto error;
 
-        if ((winfo->flags & wndf_popup) == 0) {
+        if ((winfo->flags & (wndf_popup | wndf_system)) == 0) {
                 rc = wndlist_append(wndlist, wnd_id, winfo->caption, true);
                 if (rc != EOK) {

uspace/lib/display/include/types/display/wndparams.h

@@ -45 +45 @@
         wndf_setpos = 0x2,
         /** Window is maximized */
-        wndf_maximized = 0x4
+        wndf_maximized = 0x4,
+        /** Special system window */
+        wndf_system = 0x8
 } display_wnd_flags_t;
 

uspace/lib/ui/include/types/ui/window.h

@@ -66 +66 @@
 typedef enum {
         /** Popup window */
-        ui_wndf_popup = 0x1
+        ui_wndf_popup = 0x1,
+        /** Special system window */
+        ui_wndf_system = 0x2
 } ui_wnd_flags_t;
 

uspace/lib/ui/src/window.c

@@ -228 +228 @@
         if ((params->flags & ui_wndf_popup) != 0)
                 dparams.flags |= wndf_popup;
+        if ((params->flags & ui_wndf_system) != 0)
+                dparams.flags |= wndf_system;
 
         if (ui->display != NULL) {