Changes in uspace/lib/ui/src/menu.c [ff6e91b:d7f82635] in mainline

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_margin_text = 1
+        menu_frame_h_text = 1
 };
 
@@ -277 +276 @@
  * @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)
 {
@@ -365 +282 @@
         ui_menu_entry_t *mentry;
         ui_menu_geom_t geom;
+        gfx_rect_t bg_rect;
         errno_t rc;
 
@@ -370 +288 @@
         ui_menu_get_geom(menu, spos, &geom);
 
-        /* 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);
+        /* 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;