Changeset 6186f9f in mainline for uspace/lib/ui/src/menuentry.c

Timestamp:

2021-04-13T17:20:20Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f3a7b0d

Parents:

b8b64a8

Message:

Add menu separator entry

File:

• uspace/lib/ui/src/menuentry.c (modified) (6 diffs)

uspace/lib/ui/src/menuentry.c

@@ -55 +55 @@
         menu_entry_vpad = 4,
         menu_entry_column_pad = 8,
+        menu_entry_sep_height = 2,
         menu_entry_hpad_text = 1,
         menu_entry_vpad_text = 0,
-        menu_entry_column_pad_text = 2
+        menu_entry_column_pad_text = 2,
+        menu_entry_sep_height_text = 1
 };
 
@@ -107 +109 @@
 }
 
+/** Create new separator menu entry.
+ *
+ * @param menu Menu
+ * @param rmentry Place to store pointer to new menu entry
+ * @return EOK on success, ENOMEM if out of memory
+ */
+errno_t ui_menu_entry_sep_create(ui_menu_t *menu, ui_menu_entry_t **rmentry)
+{
+        ui_menu_entry_t *mentry;
+        errno_t rc;
+
+        rc = ui_menu_entry_create(menu, "", "", &mentry);
+        if (rc != EOK)
+                return rc;
+
+        /* Need to adjust menu height when changing to separator */
+        menu->total_h -= ui_menu_entry_height(mentry);
+        mentry->separator = true;
+        menu->total_h += ui_menu_entry_height(mentry);
+
+        *rmentry = mentry;
+        return EOK;
+}
+
 /** Destroy menu entry.
  *
@@ -238 +264 @@
         }
 
-        gfx_font_get_metrics(res->font, &metrics);
-        height = metrics.ascent + metrics.descent + 1;
+        if (mentry->separator) {
+                /* Separator menu entry */
+                if (res->textmode)
+                        height = menu_entry_sep_height_text;
+                else
+                        height = menu_entry_sep_height;
+        } else {
+                /* Normal menu entry */
+                gfx_font_get_metrics(res->font, &metrics);
+                height = metrics.ascent + metrics.descent + 1;
+        }
+
         return height + 2 * vpad;
 }
@@ -255 +291 @@
         gfx_color_t *bg_color;
         ui_menu_entry_geom_t geom;
+        gfx_rect_t rect;
         errno_t rc;
 
@@ -292 +329 @@
                 goto error;
 
+        if (mentry->separator) {
+                rect.p0 = geom.caption_pos;
+                rect.p1.x = geom.shortcut_pos.x;
+                rect.p1.y = rect.p0.y + 2;
+                rc = ui_paint_bevel(res->gc, &rect, res->wnd_shadow_color,
+                    res->wnd_highlight_color, 1, NULL);
+                if (rc != EOK)
+                        goto error;
+        }
+
         rc = gfx_update(res->gc);
         if (rc != EOK)
@@ -309 +356 @@
 {
         if (mentry->held)
+                return;
+
+        if (mentry->separator)
                 return;