Changeset 8a9a41e in mainline for uspace/lib/ui/src/menu.c

Timestamp:

2021-10-24T08:28:43Z (2 years ago)

Author:

GitHub <noreply@…>

Children:

f628215

Parents:

2ce943a (diff), cd981f2a (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:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

• uspace/lib/ui/src/menu.c (modified) (4 diffs)

uspace/lib/ui/src/menu.c

@@ -58 +58 @@
         menu_frame_h = 4,
         menu_frame_w_text = 2,
-        menu_frame_h_text = 1
+        menu_frame_h_text = 1,
+        menu_frame_h_margin_text = 1
 };
 
@@ -276 +277 @@
  * @return EOK on success or an error code
  */
+errno_t ui_menu_paint_bg_gfx(ui_menu_t *menu, gfx_coord2_t *spos)
+{
+        ui_resource_t *res;
+        ui_menu_geom_t geom;
+        gfx_rect_t bg_rect;
+        errno_t rc;
+
+        res = ui_menu_get_res(menu);
+        ui_menu_get_geom(menu, spos, &geom);
+
+        /* Paint menu frame */
+
+        rc = gfx_set_color(res->gc, res->wnd_face_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = ui_paint_outset_frame(res, &geom.outer_rect, &bg_rect);
+        if (rc != EOK)
+                goto error;
+
+        /* Paint menu background */
+
+        rc = gfx_set_color(res->gc, res->wnd_face_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_fill_rect(res->gc, &bg_rect);
+        if (rc != EOK)
+                goto error;
+
+        return EOK;
+error:
+        return rc;
+}
+
+/** Paint menu.
+ *
+ * @param menu Menu
+ * @param spos Starting position (top-left corner)
+ * @return EOK on success or an error code
+ */
+errno_t ui_menu_paint_bg_text(ui_menu_t *menu, gfx_coord2_t *spos)
+{
+        ui_resource_t *res;
+        ui_menu_geom_t geom;
+        gfx_rect_t rect;
+        errno_t rc;
+
+        res = ui_menu_get_res(menu);
+        ui_menu_get_geom(menu, spos, &geom);
+
+        /* Paint menu background */
+
+        rc = gfx_set_color(res->gc, res->wnd_face_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_fill_rect(res->gc, &geom.outer_rect);
+        if (rc != EOK)
+                goto error;
+
+        /* Paint menu box */
+
+        rect = geom.outer_rect;
+        rect.p0.x += menu_frame_h_margin_text;
+        rect.p1.x -= menu_frame_h_margin_text;
+
+        rc = ui_paint_text_box(res, &rect, ui_box_single, res->wnd_face_color);
+        if (rc != EOK)
+                goto error;
+
+        return EOK;
+error:
+        return rc;
+}
+
+/** Paint menu.
+ *
+ * @param menu Menu
+ * @param spos Starting position (top-left corner)
+ * @return EOK on success or an error code
+ */
 errno_t ui_menu_paint(ui_menu_t *menu, gfx_coord2_t *spos)
 {
@@ -282 +365 @@
         ui_menu_entry_t *mentry;
         ui_menu_geom_t geom;
-        gfx_rect_t bg_rect;
         errno_t rc;
 
@@ -288 +370 @@
         ui_menu_get_geom(menu, spos, &geom);
 
-        /* Paint menu frame */
-
-        rc = gfx_set_color(res->gc, res->wnd_face_color);
-        if (rc != EOK)
-                goto error;
-
-        rc = ui_paint_outset_frame(res, &geom.outer_rect, &bg_rect);
-        if (rc != EOK)
-                goto error;
-
-        /* Paint menu background */
-
-        rc = gfx_set_color(res->gc, res->wnd_face_color);
-        if (rc != EOK)
-                goto error;
-
-        rc = gfx_fill_rect(res->gc, &bg_rect);
+        /* Paint menu frame and background */
+        if (res->textmode)
+                rc = ui_menu_paint_bg_text(menu, spos);
+        else
+                rc = ui_menu_paint_bg_gfx(menu, spos);
         if (rc != EOK)
                 goto error;