Changeset f2416ec3 in mainline for uspace/lib/ui/src

Timestamp:

2021-05-26T07:40:59Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Children:

6baab83

Parents:

344f8b9

git-author:

Jiri Svoboda <jiri@…> (2021-05-25 18:40:50)

git-committer:

Jiri Svoboda <jiri@…> (2021-05-26 07:40:59)

Message:

Specify parent window when creating popup

This will be used in conjunction with ui_wnd_popup_params_t.place
(a rectangle relative to the parent window) to determine where on
the screen the popup window should appear.

Location:

uspace/lib/ui/src

Files:

• menu.c (modified) (3 diffs)
• menubar.c (modified) (11 diffs)
• menuentry.c (modified) (4 diffs)
• popup.c (modified) (2 diffs)

uspace/lib/ui/src/menu.c

@@ -49 +49 @@
 #include <ui/menuentry.h>
 #include <ui/resource.h>
+#include <ui/window.h>
 #include "../private/menubar.h"
 #include "../private/menu.h"
@@ -170 +171 @@
     ui_menu_geom_t *geom)
 {
+        ui_resource_t *res;
         gfx_coord2_t edim;
         gfx_coord_t frame_w;
         gfx_coord_t frame_h;
 
-        if (menu->mbar->res->textmode) {
+        res = ui_window_get_res(menu->mbar->window);
+
+        if (res->textmode) {
                 frame_w = menu_frame_w_text;
                 frame_h = menu_frame_h_text;
@@ -242 +246 @@
         params.rect = geom.outer_rect;
 
-        rc = ui_popup_create(menu->mbar->ui, &params, &popup);
+        rc = ui_popup_create(menu->mbar->ui, menu->mbar->window, &params,
+            &popup);
         if (rc != EOK)
                 return rc;

uspace/lib/ui/src/menubar.c

@@ -47 +47 @@
 #include <ui/menu.h>
 #include <ui/menubar.h>
+#include <ui/window.h>
 #include "../private/menubar.h"
 #include "../private/resource.h"
@@ -73 +74 @@
  *
  * @param ui UI
- * @param res UI resource
+ * @param window Window that will contain the menu bar
  * @param rmbar Place to store pointer to new menu bar
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ui_menu_bar_create(ui_t *ui, ui_resource_t *res,
-    ui_menu_bar_t **rmbar)
+errno_t ui_menu_bar_create(ui_t *ui, ui_window_t *window, ui_menu_bar_t **rmbar)
 {
         ui_menu_bar_t *mbar;
@@ -94 +94 @@
 
         mbar->ui = ui;
-        mbar->res = res;
+        mbar->window = window;
         list_initialize(&mbar->menus);
         *rmbar = mbar;
@@ -149 +149 @@
 errno_t ui_menu_bar_paint(ui_menu_bar_t *mbar)
 {
+        ui_resource_t *res;
         gfx_text_fmt_t fmt;
         gfx_coord2_t pos;
@@ -161 +162 @@
         errno_t rc;
 
+        res = ui_window_get_res(mbar->window);
+
         /* Paint menu bar background */
 
-        rc = gfx_set_color(mbar->res->gc, mbar->res->wnd_face_color);
+        rc = gfx_set_color(res->gc, res->wnd_face_color);
         if (rc != EOK)
                 goto error;
 
-        rc = gfx_fill_rect(mbar->res->gc, &mbar->rect);
+        rc = gfx_fill_rect(res->gc, &mbar->rect);
         if (rc != EOK)
                 goto error;
 
-        if (mbar->res->textmode) {
+        if (res->textmode) {
                 hpad = menubar_hpad_text;
                 vpad = menubar_vpad_text;
@@ -188 +191 @@
         while (menu != NULL) {
                 caption = ui_menu_caption(menu);
-                width = gfx_text_width(mbar->res->font, caption) + 2 * hpad;
+                width = gfx_text_width(res->font, caption) + 2 * hpad;
                 tpos.x = pos.x + hpad;
                 tpos.y = pos.y + vpad;
@@ -197 +200 @@
 
                 if (menu == mbar->selected) {
-                        fmt.color = mbar->res->wnd_sel_text_color;
-                        bg_color = mbar->res->wnd_sel_text_bg_color;
+                        fmt.color = res->wnd_sel_text_color;
+                        bg_color = res->wnd_sel_text_bg_color;
                 } else {
-                        fmt.color = mbar->res->wnd_text_color;
-                        bg_color = mbar->res->wnd_face_color;
+                        fmt.color = res->wnd_text_color;
+                        bg_color = res->wnd_face_color;
                 }
 
-                rc = gfx_set_color(mbar->res->gc, bg_color);
+                rc = gfx_set_color(res->gc, bg_color);
                 if (rc != EOK)
                         goto error;
 
-                rc = gfx_fill_rect(mbar->res->gc, &rect);
+                rc = gfx_fill_rect(res->gc, &rect);
                 if (rc != EOK)
                         goto error;
 
-                rc = gfx_puttext(mbar->res->font, &tpos, &fmt, caption);
+                rc = gfx_puttext(res->font, &tpos, &fmt, caption);
                 if (rc != EOK)
                         goto error;
@@ -220 +223 @@
         }
 
-        rc = gfx_update(mbar->res->gc);
+        rc = gfx_update(res->gc);
         if (rc != EOK)
                 goto error;
@@ -269 +272 @@
 ui_evclaim_t ui_menu_bar_pos_event(ui_menu_bar_t *mbar, pos_event_t *event)
 {
+        ui_resource_t *res;
         gfx_coord2_t pos;
         gfx_rect_t rect;
@@ -277 +281 @@
         gfx_coord2_t ppos;
 
+        res = ui_window_get_res(mbar->window);
+
         ppos.x = event->hpos;
         ppos.y = event->vpos;
 
-        if (mbar->res->textmode) {
+        if (res->textmode) {
                 hpad = menubar_hpad_text;
         } else {
@@ -291 +297 @@
         while (menu != NULL) {
                 caption = ui_menu_caption(menu);
-                width = gfx_text_width(mbar->res->font, caption) + 2 * hpad;
+                width = gfx_text_width(res->font, caption) + 2 * hpad;
 
                 rect.p0 = pos;

uspace/lib/ui/src/menuentry.c

@@ -46 +46 @@
 #include <ui/paint.h>
 #include <ui/menuentry.h>
+#include <ui/window.h>
 #include "../private/menubar.h"
 #include "../private/menuentry.h"
@@ -209 +210 @@
          * resource instead.
          */
-        res = mentry->menu->mbar->res;
+        res = ui_window_get_res(mentry->menu->mbar->window);
 
         *caption_w = gfx_text_width(res->font, mentry->caption);
@@ -235 +236 @@
          * resource instead.
          */
-        res = menu->mbar->res;
+        res = ui_window_get_res(menu->mbar->window);
 
         if (res->textmode)
@@ -274 +275 @@
          * resource instead.
          */
-        res = mentry->menu->mbar->res;
+        res = ui_window_get_res(mentry->menu->mbar->window);
 
         if (res->textmode) {

uspace/lib/ui/src/popup.c

@@ -67 +67 @@
  *
  * @param ui User interface
+ * @param parent Parent window
  * @param params Popup parameters
  * @param rpopup Place to store pointer to new popup window
  * @return EOK on success or an error code
  */
-errno_t ui_popup_create(ui_t *ui, ui_popup_params_t *params,
-    ui_popup_t **rpopup)
+errno_t ui_popup_create(ui_t *ui, ui_window_t *parent,
+    ui_popup_params_t *params, ui_popup_t **rpopup)
 {
         ui_popup_t *popup;
@@ -93 +94 @@
 
         popup->ui = ui;
+        popup->parent = parent;
         popup->window = window;