Changes in uspace/lib/gfxfont/include/types/gfx/text.h [a130983:b433f68] in mainline

File:

• uspace/lib/gfxfont/include/types/gfx/text.h (modified) (5 diffs)

uspace/lib/gfxfont/include/types/gfx/text.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2020 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 #define _TYPES_GFX_TEXT_H
 
-#include <stdbool.h>
 #include <types/gfx/coord.h>
 #include <types/gfx/color.h>
@@ -43 +42 @@
 /** Text horizontal alignment */
 typedef enum {
-        /** Align text left (start at anchor point) */
+        /** Align text left */
         gfx_halign_left,
-        /** Align text on the center (center around anchor point) */
+        /** Align text on the center */
         gfx_halign_center,
-        /** Align text right (end just before anchor point) */
+        /** Align text right */
         gfx_halign_right,
         /** Justify text on both left and right edge */
@@ -55 +54 @@
 /** Text vertical alignment */
 typedef enum {
-        /** Align top (starts at anchor point) */
+        /** Align top */
         gfx_valign_top,
-        /** Align center (centered around anchor point) */
+        /** Align center */
         gfx_valign_center,
-        /** Align bottom (end just before anchor point) */
+        /** Align bottom */
         gfx_valign_bottom,
         /** Align to baseline */
@@ -67 +66 @@
 /** Text formatting */
 typedef struct {
-        /** Text font */
-        struct gfx_font *font;
         /** Text color */
         gfx_color_t *color;
         /** Horizontal alignment */
         gfx_halign_t halign;
-        /** Width available for the text */
-        gfx_coord_t width;
+        /** Justification width (for gfx_halign_justify) */
+        gfx_coord_t justify_width;
         /** Vertical alignment */
         gfx_valign_t valign;
-        /** Abbreviate the text with ellipsis if it does not fit @c width */
-        bool abbreviate;
-        /** Underline */
-        bool underline;
 } gfx_text_fmt_t;