Changeset 8a9a41e in mainline for uspace/lib/ui/src/rbutton.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/rbutton.c (modified) (7 diffs)

uspace/lib/ui/src/rbutton.c

@@ -186 +186 @@
 }
 
-/** Paint radio button.
+/** Paint radio button in graphics mode.
  *
  * @param rbutton Radio button
  * @return EOK on success or an error code
  */
-errno_t ui_rbutton_paint(ui_rbutton_t *rbutton)
+errno_t ui_rbutton_paint_gfx(ui_rbutton_t *rbutton)
 {
         gfx_coord2_t pos;
@@ -202 +202 @@
         center.y = rbutton->rect.p0.y + rbutton_oframe_r;
 
-        /* Paint rbutton frame */
+        /* Paint radio button frame */
 
         rc = gfx_set_color(rbutton->group->res->gc,
@@ -244 +244 @@
                 goto error;
 
-        /* Paint rbutton interior */
+        /* Paint radio button 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.
  *
@@ -316 +379 @@
 void ui_rbutton_release(ui_rbutton_t *rbutton)
 {
-        ui_rbutton_t *old_selected;
-
         if (!rbutton->held)
                 return;
@@ -325 +386 @@
         if (rbutton->inside) {
                 /* Activate radio button */
-                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);
+                ui_rbutton_select(rbutton);
         }
 }
@@ -368 +418 @@
 }
 
-/** Button was selected.
+/** 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.
  *
  * @param rbutton Radio button