Changes in uspace/lib/ui/src/pbutton.c [3c54869:174be87] in mainline

File:

• uspace/lib/ui/src/pbutton.c (modified) (9 diffs)

uspace/lib/ui/src/pbutton.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -54 +54 @@
 enum {
         ui_pb_press_dx = 1,
-        ui_pb_press_dy = 1,
-        ui_pb_pad_x = 2,
-        ui_pb_pad_x_text = 1
+        ui_pb_press_dy = 1
 };
 
@@ -116 +114 @@
 
         ui_control_delete(pbutton->control);
-        free(pbutton->caption);
         free(pbutton);
 }
@@ -186 +183 @@
 {
         pbutton->isdefault = isdefault;
-}
-
-/** Get button light status.
- *
- * @param pbutton Button
- * @return @c true iff light is on
- */
-bool ui_pbutton_get_light(ui_pbutton_t *pbutton)
-{
-        return pbutton->light;
-}
-
-/** Turn button light on or off.
- *
- * @param pbutton Button
- * @param light @c true iff button should be lit
- */
-void ui_pbutton_set_light(ui_pbutton_t *pbutton, bool light)
-{
-        pbutton->light = light;
-}
-
-/** Set push button caption.
- *
- * @param pbutton Button
- * @param caption New caption
- * @return EOK on success, ENOMEM if out of memory
- */
-errno_t ui_pbutton_set_caption(ui_pbutton_t *pbutton, const char *caption)
-{
-        char *dcaption;
-
-        dcaption = str_dup(caption);
-        if (dcaption == NULL)
-                return ENOMEM;
-
-        free(pbutton->caption);
-        pbutton->caption = dcaption;
-        return EOK;
 }
 
@@ -345 +303 @@
         gfx_text_fmt_t fmt;
         gfx_rect_t rect;
-        gfx_rect_t irect;
         gfx_coord_t thickness;
-        gfx_color_t *color;
         bool depressed;
         errno_t rc;
@@ -359 +315 @@
         rect.p1.y = pbutton->rect.p1.y - thickness;
 
-        color = pbutton->light ? pbutton->res->btn_face_lit_color :
-            pbutton->res->btn_face_color;
-
-        rc = gfx_set_color(pbutton->res->gc, color);
+        rc = gfx_set_color(pbutton->res->gc, pbutton->res->btn_face_color);
         if (rc != EOK)
                 goto error;
@@ -387 +340 @@
         } else {
                 /* Text decoration */
-                ui_paint_get_inset_frame_inside(pbutton->res, &rect, &irect);
                 gfx_text_fmt_init(&fmt);
                 fmt.font = pbutton->res->font;
@@ -393 +345 @@
                 fmt.halign = gfx_halign_center;
                 fmt.valign = gfx_valign_center;
-                fmt.abbreviate = true;
-                fmt.width = irect.p1.x - irect.p0.x - 2 * ui_pb_pad_x;
 
                 rc = gfx_puttext(&pos, &fmt, pbutton->caption);
@@ -472 +422 @@
         fmt.halign = gfx_halign_center;
         fmt.valign = gfx_valign_center;
-        fmt.abbreviate = true;
-        fmt.width = rect.p1.x - rect.p0.x - 2 * ui_pb_pad_x_text;
-        if (fmt.width < 1)
-                fmt.width = 1;
 
         rc = gfx_puttext(&pos, &fmt, pbutton->caption);