Changes in uspace/app/fontedit/fontedit.c [266ec54:211fd68] in mainline

File:

• uspace/app/fontedit/fontedit.c (modified) (9 diffs)

uspace/app/fontedit/fontedit.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -167 +167 @@
 }
 
+/** Adjust font underline Y0.
+ *
+ * @param fedit Font editor
+ */
+static void font_edit_adjust_underline_y0(font_edit_t *fedit,
+    gfx_coord_t change)
+{
+        gfx_font_metrics_t fmetrics;
+
+        gfx_font_get_metrics(fedit->font, &fmetrics);
+        fmetrics.underline_y0 += change;
+        (void) gfx_font_set_metrics(fedit->font, &fmetrics);
+
+        printf("New underline Y0: %d\n", fmetrics.underline_y0);
+        font_edit_paint(fedit);
+}
+
+/** Adjust font underline Y1.
+ *
+ * @param fedit Font editor
+ */
+static void font_edit_adjust_underline_y1(font_edit_t *fedit,
+    gfx_coord_t change)
+{
+        gfx_font_metrics_t fmetrics;
+
+        gfx_font_get_metrics(fedit->font, &fmetrics);
+        fmetrics.underline_y1 += change;
+        (void) gfx_font_set_metrics(fedit->font, &fmetrics);
+
+        printf("New underline Y1: %d\n", fmetrics.underline_y1);
+        font_edit_paint(fedit);
+}
+
 /** Handle font editor close event.
  *
@@ -314 +348 @@
                 font_edit_adjust_leading(fedit, +1);
                 break;
+        case KC_U:
+                font_edit_adjust_underline_y0(fedit, -1);
+                break;
+        case KC_I:
+                font_edit_adjust_underline_y0(fedit, +1);
+                break;
+        case KC_O:
+                font_edit_adjust_underline_y1(fedit, -1);
+                break;
+        case KC_P:
+                font_edit_adjust_underline_y1(fedit, +1);
+                break;
         case KC_X:
                 (void) gfx_glyph_bmp_clear(fedit->gbmp);
@@ -446 +492 @@
  * @param fedit Font editor
  * @param x Starting X coordinate
- * @Param y Starting Y coordinate
+ * @param y Starting Y coordinate
+ * @param color Color
  * @param str String
  */
 static errno_t font_edit_paint_preview_str(font_edit_t *fedit,
-    gfx_coord_t x, gfx_coord_t y, const char *str)
+    gfx_coord_t x, gfx_coord_t y, gfx_color_t *color, const char *str)
 {
         gfx_text_fmt_t fmt;
@@ -456 +503 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = fedit->font;
+        fmt.color = color;
 
         pos.x = x;
         pos.y = y;
 
-        return gfx_puttext(fedit->font, &pos, &fmt, str);
+        return gfx_puttext(&pos, &fmt, str);
 }
 
@@ -480 +529 @@
                 goto error;
 
-        rc = font_edit_paint_preview_str(fedit, 20, 20,
+        rc = font_edit_paint_preview_str(fedit, 20, 20, color,
             "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
         if (rc != EOK)
                 goto error;
 
-        rc = font_edit_paint_preview_str(fedit, 20, 40,
+        rc = font_edit_paint_preview_str(fedit, 20, 40, color,
             "THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG");
         if (rc != EOK)
                 goto error;
 
-        rc = font_edit_paint_preview_str(fedit, 20, 60,
+        rc = font_edit_paint_preview_str(fedit, 20, 60, color,
             "abcdefghijklmnopqrstuvwxyz");
         if (rc != EOK)
                 goto error;
 
-        rc = font_edit_paint_preview_str(fedit, 20, 80,
+        rc = font_edit_paint_preview_str(fedit, 20, 80, color,
             "the quick brown fox jumps over the lazy dog");
         if (rc != EOK)
                 goto error;
 
-        rc = font_edit_paint_preview_str(fedit, 20, 100,
+        rc = font_edit_paint_preview_str(fedit, 20, 100, color,
             "0123456789,./<>?;'\\:\"|[]{}`~!@#$%^&*()-_=+");
         if (rc != EOK)
@@ -519 +568 @@
         gfx_color_t *color = NULL;
         gfx_rect_t rect;
+        gfx_rect_t rect2;
         gfx_rect_t grect;
         gfx_font_metrics_t fmetrics;
@@ -562 +612 @@
             fmetrics.leading, &rect);
         rect.p1.x += 100;
+
+        rc = gfx_fill_rect(fedit->gc, &rect);
+        if (rc != EOK)
+                goto error;
+
+        gfx_color_delete(color);
+
+        /* Display underline */
+
+        rc = gfx_color_new_rgb_i16(0x4000, 0x4000, 0, &color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_set_color(fedit->gc, color);
+        if (rc != EOK)
+                goto error;
+
+        font_edit_gpix_to_disp(fedit, 0, fmetrics.underline_y0, &rect);
+        font_edit_gpix_to_disp(fedit, 10, fmetrics.underline_y1, &rect2);
+        rect.p1 = rect2.p0;
 
         rc = gfx_fill_rect(fedit->gc, &rect);
@@ -717 +787 @@
          * to rect
          */
-        ui_wdecor_rect_from_app(params.style, &rect, &wrect);
+        ui_wdecor_rect_from_app(ui, params.style, &rect, &wrect);
         off = wrect.p0;
         gfx_rect_rtranslate(&off, &wrect, &params.rect);