Changeset 9e84d2c in mainline for uspace/lib

Timestamp:

2021-06-10T13:22:33Z (4 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

5823aef3

Parents:

c9927c66

git-author:

Jiri Svoboda <jiri@…> (2021-06-02 17:00:03)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-06-10 13:22:33)

Message:

Popup windows event delivery is special

Popup windows don't get focus, yet they still receive events.

Location:

uspace/lib

Files:

• display/include/types/display/wndparams.h (modified) (3 diffs)
• ui/include/types/ui/window.h (modified) (2 diffs)
• ui/include/ui/window.h (modified) (1 diff)
• ui/src/popup.c (modified) (1 diff)
• ui/src/window.c (modified) (1 diff)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -38 +38 @@
 #include <gfx/coord.h>
 
+/** Window flags */
+typedef enum {
+        /** Popup window (capture events, no focus) */
+        wndf_popup = 0x1
+} display_wnd_flags_t;
+
 /** Parameters for a new window.
  *
@@ -50 +56 @@
         /** Minimum size (when being resized) */
         gfx_coord2_t min_size;
+        /** Flags */
+        display_wnd_flags_t flags;
 } display_wnd_params_t;
 

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

@@ -63 +63 @@
 } ui_wnd_placement_t;
 
+/** Window flags */
+typedef enum {
+        /** Popup window */
+        ui_wndf_popup = 0x1
+} ui_wnd_flags_t;
+
 /** Window parameters */
 typedef struct {
@@ -73 +79 @@
         /** Window placement */
         ui_wnd_placement_t placement;
+        /** Window flags */
+        ui_wnd_flags_t flags;
         /** Parent rectangle for popup windows */
         gfx_rect_t prect;

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *

uspace/lib/ui/src/popup.c

@@ -94 +94 @@
         wparams.style &= ~ui_wds_decorated;
         wparams.placement = ui_wnd_place_popup;
+        wparams.flags |= ui_wndf_popup;
 
         /* Compute position of parent rectangle relative to the screen */

uspace/lib/ui/src/window.c

@@ -188 +188 @@
         gfx_rect_dims(&params->rect, &dparams.min_size);
 
+        if ((params->flags & ui_wndf_popup) != 0)
+                dparams.flags |= wndf_popup;
+
         if (ui->display != NULL) {
                 if (params->placement != ui_wnd_place_default) {