Changeset 8a9a41e in mainline for uspace/lib/ui/include/ui/resource.h

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/include/ui/resource.h (modified) (2 diffs)

uspace/lib/ui/include/ui/resource.h

@@ -39 +39 @@
 #include <errno.h>
 #include <gfx/context.h>
+#include <gfx/font.h>
 #include <stdbool.h>
 #include <types/ui/resource.h>
@@ -47 +48 @@
     void *);
 extern void ui_resource_expose(ui_resource_t *);
+extern gfx_font_t *ui_resource_get_font(ui_resource_t *);
 
 #endif