Changeset 400a16d in mainline
- Timestamp:
- 2021-09-03T09:27:57Z (3 years ago)
- Branches:
- master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 81d3612
- Parents:
- f7c12b3
- git-author:
- Jiri Svoboda <jiri@…> (2021-09-02 17:26:05)
- git-committer:
- Jiri Svoboda <jiri@…> (2021-09-03 09:27:57)
- Location:
- uspace
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/gfxdemo/gfxdemo.c
rf7c12b3 r400a16d 706 706 goto error; 707 707 708 pos.x = rect.p1.x - 1;708 pos.x = rect.p1.x; 709 709 pos.y = rect.p0.y; 710 710 fmt.halign = gfx_halign_right; … … 729 729 goto error; 730 730 731 pos.x = rect.p1.x - 1;731 pos.x = rect.p1.x; 732 732 pos.y = (rect.p0.y + rect.p1.y - 1) / 2; 733 733 fmt.halign = gfx_halign_right; … … 746 746 747 747 pos.x = (rect.p0.x + rect.p1.x - 1) / 2; 748 pos.y = rect.p1.y - 1;748 pos.y = rect.p1.y; 749 749 fmt.halign = gfx_halign_center; 750 750 rc = gfx_puttext(font, &pos, &fmt, "Bottom center"); … … 752 752 goto error; 753 753 754 pos.x = rect.p1.x - 1;755 pos.y = rect.p1.y - 1;754 pos.x = rect.p1.x; 755 pos.y = rect.p1.y; 756 756 fmt.halign = gfx_halign_right; 757 757 rc = gfx_puttext(font, &pos, &fmt, "Bottom right"); -
uspace/lib/gfxfont/include/types/gfx/text.h
rf7c12b3 r400a16d 42 42 /** Text horizontal alignment */ 43 43 typedef enum { 44 /** Align text left */44 /** Align text left (start at anchor point) */ 45 45 gfx_halign_left, 46 /** Align text on the center */46 /** Align text on the center (center around anchor point) */ 47 47 gfx_halign_center, 48 /** Align text right */48 /** Align text right (end just before anchor point) */ 49 49 gfx_halign_right, 50 50 /** Justify text on both left and right edge */ … … 54 54 /** Text vertical alignment */ 55 55 typedef enum { 56 /** Align top */56 /** Align top (starts at anchor point) */ 57 57 gfx_valign_top, 58 /** Align center */58 /** Align center (centered around anchor point) */ 59 59 gfx_valign_center, 60 /** Align bottom */60 /** Align bottom (end just before anchor point) */ 61 61 gfx_valign_bottom, 62 62 /** Align to baseline */ -
uspace/lib/gfxfont/src/text.c
rf7c12b3 r400a16d 191 191 break; 192 192 case gfx_halign_right: 193 spos->x -= width - 1;193 spos->x -= width; 194 194 break; 195 195 default: … … 210 210 break; 211 211 case gfx_valign_bottom: 212 cpos.y -= fmetrics.descent ;212 cpos.y -= fmetrics.descent + 1; 213 213 break; 214 214 default: -
uspace/lib/ui/src/wdecor.c
rf7c12b3 r400a16d 345 345 geom->title_bar_rect.p0 = geom->interior_rect.p0; 346 346 geom->title_bar_rect.p1.x = geom->interior_rect.p1.x; 347 geom->title_bar_rect.p1.y = geom->interior_rect.p0.y 348 +wdecor_tbar_h;347 geom->title_bar_rect.p1.y = geom->interior_rect.p0.y + 348 wdecor_tbar_h; 349 349 } 350 350
Note:
See TracChangeset
for help on using the changeset viewer.