Changes in uspace/app/fontedit/fontedit.c [b433f68:211fd68] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/fontedit/fontedit.c
rb433f68 r211fd68 1 1 /* 2 * Copyright (c) 202 0Jiri Svoboda2 * Copyright (c) 2024 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 167 167 } 168 168 169 /** Adjust font underline Y0. 170 * 171 * @param fedit Font editor 172 */ 173 static void font_edit_adjust_underline_y0(font_edit_t *fedit, 174 gfx_coord_t change) 175 { 176 gfx_font_metrics_t fmetrics; 177 178 gfx_font_get_metrics(fedit->font, &fmetrics); 179 fmetrics.underline_y0 += change; 180 (void) gfx_font_set_metrics(fedit->font, &fmetrics); 181 182 printf("New underline Y0: %d\n", fmetrics.underline_y0); 183 font_edit_paint(fedit); 184 } 185 186 /** Adjust font underline Y1. 187 * 188 * @param fedit Font editor 189 */ 190 static void font_edit_adjust_underline_y1(font_edit_t *fedit, 191 gfx_coord_t change) 192 { 193 gfx_font_metrics_t fmetrics; 194 195 gfx_font_get_metrics(fedit->font, &fmetrics); 196 fmetrics.underline_y1 += change; 197 (void) gfx_font_set_metrics(fedit->font, &fmetrics); 198 199 printf("New underline Y1: %d\n", fmetrics.underline_y1); 200 font_edit_paint(fedit); 201 } 202 169 203 /** Handle font editor close event. 170 204 * … … 314 348 font_edit_adjust_leading(fedit, +1); 315 349 break; 350 case KC_U: 351 font_edit_adjust_underline_y0(fedit, -1); 352 break; 353 case KC_I: 354 font_edit_adjust_underline_y0(fedit, +1); 355 break; 356 case KC_O: 357 font_edit_adjust_underline_y1(fedit, -1); 358 break; 359 case KC_P: 360 font_edit_adjust_underline_y1(fedit, +1); 361 break; 316 362 case KC_X: 317 363 (void) gfx_glyph_bmp_clear(fedit->gbmp); … … 457 503 458 504 gfx_text_fmt_init(&fmt); 505 fmt.font = fedit->font; 459 506 fmt.color = color; 460 507 … … 462 509 pos.y = y; 463 510 464 return gfx_puttext( fedit->font,&pos, &fmt, str);511 return gfx_puttext(&pos, &fmt, str); 465 512 } 466 513 … … 521 568 gfx_color_t *color = NULL; 522 569 gfx_rect_t rect; 570 gfx_rect_t rect2; 523 571 gfx_rect_t grect; 524 572 gfx_font_metrics_t fmetrics; … … 564 612 fmetrics.leading, &rect); 565 613 rect.p1.x += 100; 614 615 rc = gfx_fill_rect(fedit->gc, &rect); 616 if (rc != EOK) 617 goto error; 618 619 gfx_color_delete(color); 620 621 /* Display underline */ 622 623 rc = gfx_color_new_rgb_i16(0x4000, 0x4000, 0, &color); 624 if (rc != EOK) 625 goto error; 626 627 rc = gfx_set_color(fedit->gc, color); 628 if (rc != EOK) 629 goto error; 630 631 font_edit_gpix_to_disp(fedit, 0, fmetrics.underline_y0, &rect); 632 font_edit_gpix_to_disp(fedit, 10, fmetrics.underline_y1, &rect2); 633 rect.p1 = rect2.p0; 566 634 567 635 rc = gfx_fill_rect(fedit->gc, &rect); … … 719 787 * to rect 720 788 */ 721 ui_wdecor_rect_from_app( params.style, &rect, &wrect);789 ui_wdecor_rect_from_app(ui, params.style, &rect, &wrect); 722 790 off = wrect.p0; 723 791 gfx_rect_rtranslate(&off, &wrect, ¶ms.rect);
Note:
See TracChangeset
for help on using the changeset viewer.