Changeset 5713e5f in mainline for uspace/lib/gui/window.c

Timestamp:

2014-09-01T19:17:55Z (11 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

21365c0

Parents:

a4666a9 (diff), 00ddb40 (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 improvements in the graphics stack.

• Support for drawing proportional fonts (although no actual font file included yet)
• Implementation of bilinear filter

File:

• uspace/lib/gui/window.c (modified) (4 diffs)

uspace/lib/gui/window.c

@@ -55 +55 @@
 #include <drawctx.h>
 #include <surface.h>
+#include <font/embedded.h>
 
 #include "common.h"
@@ -160 +161 @@
         /* Window caption */
         
-        font_t font;
-        font_init(&font, FONT_DECODER_EMBEDDED, NULL, 16);
-        
-        drawctx_set_font(&drawctx, &font);
+        font_t *font;
+        int rc = embedded_font_create(&font, 16);
+        if (rc != EOK) {
+                window_yield(widget->window);
+                return;
+        }
+        
+        drawctx_set_font(&drawctx, font);
         source_set_color(&source, widget->window->is_focused ?
             color_caption_focus : color_caption_unfocus);
@@ -169 +174 @@
         sysarg_t cpt_width;
         sysarg_t cpt_height;
-        font_get_box(&font, widget->window->caption, &cpt_width, &cpt_height);
+        font_get_box(font, widget->window->caption, &cpt_width, &cpt_height);
         
         bool draw_title =
@@ -183 +188 @@
         }
         
-        font_release(&font);
+        font_release(font);
         window_yield(widget->window);
 }