Changes in uspace/lib/ui/src/rbutton.c [ff6e91b:b433f68] in mainline

File:

• uspace/lib/ui/src/rbutton.c (modified) (7 diffs)

uspace/lib/ui/src/rbutton.c

@@ -186 +186 @@
 }
 
-/** Paint radio button in graphics mode.
+/** Paint radio button.
  *
  * @param rbutton Radio button
  * @return EOK on success or an error code
  */
-errno_t ui_rbutton_paint_gfx(ui_rbutton_t *rbutton)
+errno_t ui_rbutton_paint(ui_rbutton_t *rbutton)
 {
         gfx_coord2_t pos;
@@ -202 +202 @@
         center.y = rbutton->rect.p0.y + rbutton_oframe_r;
 
-        /* Paint radio button frame */
+        /* Paint rbutton frame */
 
         rc = gfx_set_color(rbutton->group->res->gc,
@@ -244 +244 @@
                 goto error;
 
-        /* Paint radio button interior */
+        /* Paint rbutton interior */
         depressed = rbutton->held && rbutton->inside;
 
@@ -296 +296 @@
 }
 
-/** Paint radio button in text mode.
- *
- * @param rbutton Radio button
- * @return EOK on success or an error code
- */
-errno_t ui_rbutton_paint_text(ui_rbutton_t *rbutton)
-{
-        gfx_coord2_t pos;
-        gfx_text_fmt_t fmt;
-        bool depressed;
-        errno_t rc;
-
-        /* Paint radio button */
-
-        depressed = rbutton->held && rbutton->inside;
-
-        pos.x = rbutton->rect.p0.x;
-        pos.y = rbutton->rect.p0.y;
-
-        gfx_text_fmt_init(&fmt);
-        fmt.color = depressed ? rbutton->group->res->entry_act_bg_color :
-            rbutton->group->res->wnd_text_color;
-        fmt.halign = gfx_halign_left;
-        fmt.valign = gfx_valign_top;
-
-        rc = gfx_puttext(rbutton->group->res->font, &pos, &fmt,
-            rbutton->group->selected == rbutton ? "(\u2022)" : "( )");
-        if (rc != EOK)
-                goto error;
-
-        /* Paint radio button label */
-
-        pos.x += 4;
-
-        fmt.color = rbutton->group->res->wnd_text_color;
-
-        rc = gfx_puttext(rbutton->group->res->font, &pos, &fmt,
-            rbutton->caption);
-        if (rc != EOK)
-                goto error;
-
-        rc = gfx_update(rbutton->group->res->gc);
-        if (rc != EOK)
-                goto error;
-
-        return EOK;
-error:
-        return rc;
-}
-
-/** Paint radio button.
- *
- * @param rbutton Radio button
- * @return EOK on success or an error code
- */
-errno_t ui_rbutton_paint(ui_rbutton_t *rbutton)
-{
-        if (rbutton->group->res->textmode)
-                return ui_rbutton_paint_text(rbutton);
-        else
-                return ui_rbutton_paint_gfx(rbutton);
-}
-
 /** Press down button.
  *
@@ -379 +316 @@
 void ui_rbutton_release(ui_rbutton_t *rbutton)
 {
+        ui_rbutton_t *old_selected;
+
         if (!rbutton->held)
                 return;
@@ -386 +325 @@
         if (rbutton->inside) {
                 /* Activate radio button */
-                ui_rbutton_select(rbutton);
+                old_selected = rbutton->group->selected;
+
+                if (old_selected != rbutton) {
+                        rbutton->group->selected = rbutton;
+                        ui_rbutton_paint(old_selected);
+                }
+
+                /* Repaint and notify */
+                (void) ui_rbutton_paint(rbutton);
+
+                if (old_selected != rbutton)
+                        ui_rbutton_selected(rbutton);
         }
 }
@@ -418 +368 @@
 }
 
-/** Select radio button.
- *
- * @param rbutton Radio button
- */
-void ui_rbutton_select(ui_rbutton_t *rbutton)
-{
-        ui_rbutton_t *old_selected;
-
-        old_selected = rbutton->group->selected;
-
-        if (old_selected != rbutton) {
-                rbutton->group->selected = rbutton;
-                ui_rbutton_paint(old_selected);
-        }
-
-        /* Repaint and notify */
-        (void) ui_rbutton_paint(rbutton);
-
-        if (old_selected != rbutton)
-                ui_rbutton_selected(rbutton);
-}
-
-/** Notify that button was selected.
+/** Button was selected.
  *
  * @param rbutton Radio button