diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-10-22 07:22:26 +0300 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-10-22 07:22:26 +0300 |
commit | c752568f1cc5cee1d1957644a20482501b96c25c (patch) | |
tree | 33e2deacb98db8598ab118158fd1f494fb6adfbd /src/ui/labelwidget.c | |
parent | d14f9aebe27cd48a8d21c0eb691c8e7bf94722a8 (diff) | |
parent | b8471251e785c0c41fdb396c1c55a5fe76363dc2 (diff) |
Merge branch 'work/v1.8' into dev
Diffstat (limited to 'src/ui/labelwidget.c')
-rw-r--r-- | src/ui/labelwidget.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c index 1cbad550..e4fe9d5f 100644 --- a/src/ui/labelwidget.c +++ b/src/ui/labelwidget.c | |||
@@ -385,7 +385,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) { | |||
385 | } | 385 | } |
386 | else if (flags & alignLeft_WidgetFlag) { | 386 | else if (flags & alignLeft_WidgetFlag) { |
387 | draw_Text(d->font, add_I2(bounds.pos, addX_I2(padding_LabelWidget_(d, 0), iconPad)), | 387 | draw_Text(d->font, add_I2(bounds.pos, addX_I2(padding_LabelWidget_(d, 0), iconPad)), |
388 | fg, cstr_String(&d->label)); | 388 | fg, "%s", cstr_String(&d->label)); |
389 | if ((flags & drawKey_WidgetFlag) && d->key) { | 389 | if ((flags & drawKey_WidgetFlag) && d->key) { |
390 | iString str; | 390 | iString str; |
391 | init_String(&str); | 391 | init_String(&str); |
@@ -400,6 +400,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) { | |||
400 | : colorEscape != none_ColorId ? colorEscape | 400 | : colorEscape != none_ColorId ? colorEscape |
401 | : uiTextShortcut_ColorId,*/ | 401 | : uiTextShortcut_ColorId,*/ |
402 | right_Alignment, | 402 | right_Alignment, |
403 | "%s", | ||
403 | cstr_String(&str)); | 404 | cstr_String(&str)); |
404 | deinit_String(&str); | 405 | deinit_String(&str); |
405 | } | 406 | } |
@@ -410,6 +411,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) { | |||
410 | add_I2(topRight_Rect(bounds), negX_I2(padding_LabelWidget_(d, 1))), | 411 | add_I2(topRight_Rect(bounds), negX_I2(padding_LabelWidget_(d, 1))), |
411 | fg, | 412 | fg, |
412 | right_Alignment, | 413 | right_Alignment, |
414 | "%s", | ||
413 | cstr_String(&d->label)); | 415 | cstr_String(&d->label)); |
414 | } | 416 | } |
415 | else { | 417 | else { |