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

File:

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

uspace/lib/ui/src/rbutton.c

@@ -278 +278 @@
 
         gfx_text_fmt_init(&fmt);
-        fmt.font = rbutton->group->res->font;
         fmt.color = rbutton->group->res->wnd_text_color;
         fmt.halign = gfx_halign_left;
         fmt.valign = gfx_valign_center;
 
-        rc = gfx_puttext(&pos, &fmt, rbutton->caption);
+        rc = gfx_puttext(rbutton->group->res->font, &pos, &fmt,
+            rbutton->caption);
         if (rc != EOK)
                 goto error;
@@ -316 +316 @@
 
         gfx_text_fmt_init(&fmt);
-        fmt.font = rbutton->group->res->font;
         fmt.color = depressed ? rbutton->group->res->entry_act_bg_color :
             rbutton->group->res->wnd_text_color;
@@ -322 +321 @@
         fmt.valign = gfx_valign_top;
 
-        rc = gfx_puttext(&pos, &fmt, rbutton->group->selected == rbutton ?
-            "(\u2022)" : "( )");
+        rc = gfx_puttext(rbutton->group->res->font, &pos, &fmt,
+            rbutton->group->selected == rbutton ? "(\u2022)" : "( )");
         if (rc != EOK)
                 goto error;
@@ -333 +332 @@
         fmt.color = rbutton->group->res->wnd_text_color;
 
-        rc = gfx_puttext(&pos, &fmt, rbutton->caption);
+        rc = gfx_puttext(rbutton->group->res->font, &pos, &fmt,
+            rbutton->caption);
         if (rc != EOK)
                 goto error;
@@ -490 +490 @@
                 }
                 break;
-        case POS_DCLICK:
-                break;
         }