Changeset 15d0046 in mainline for uspace/lib/gui/label.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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.

Message:

Merge mainline changes

File:

• uspace/lib/gui/label.c (modified) (6 diffs)

uspace/lib/gui/label.c

@@ -38 +38 @@
 #include <drawctx.h>
 #include <surface.h>
+#include <font/embedded.h>
+#include <errno.h>
 #include "window.h"
 #include "label.h"
@@ -58 +60 @@
         sysarg_t cpt_width;
         sysarg_t cpt_height;
-        font_get_box(&lbl->font, lbl->caption, &cpt_width, &cpt_height);
+        font_get_box(lbl->font, lbl->caption, &cpt_width, &cpt_height);
         
         if ((widget->width >= cpt_width) && (widget->height >= cpt_height)) {
@@ -65 +67 @@
                 
                 drawctx_set_source(&drawctx, &lbl->text);
-                drawctx_set_font(&drawctx, &lbl->font);
+                drawctx_set_font(&drawctx, lbl->font);
                 
                 if (lbl->caption)
@@ -84 +86 @@
                 sysarg_t cpt_width;
                 sysarg_t cpt_height;
-                font_get_box(&lbl->font, lbl->caption, &cpt_width, &cpt_height);
+                font_get_box(lbl->font, lbl->caption, &cpt_width, &cpt_height);
                 
                 lbl->widget.width_min = cpt_width + 4;
@@ -99 +101 @@
         widget_deinit(&lbl->widget);
         free(lbl->caption);
-        font_release(&lbl->font);
+        font_release(lbl->font);
 }
 
@@ -161 +163 @@
                 lbl->caption = str_dup(caption);
         
-        font_init(&lbl->font, FONT_DECODER_EMBEDDED, NULL, points);
+        int rc = embedded_font_create(&lbl->font, points);
+        if (rc != EOK) {
+                free(lbl->caption);
+                lbl->caption = NULL;
+                return false;
+        }
         
         sysarg_t cpt_width;
         sysarg_t cpt_height;
-        font_get_box(&lbl->font, lbl->caption, &cpt_width, &cpt_height);
+        font_get_box(lbl->font, lbl->caption, &cpt_width, &cpt_height);
         
         lbl->widget.width_min = cpt_width + 4;