Skip to content

Commit 32db006

Browse files
committed
Allow other text elements to have a cursor and listen for keyboard and mouse events
1 parent d66cefe commit 32db006

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

source/engine/ui.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3757,20 +3757,20 @@ namespace UI
37573757
}
37583758
}
37593759

3760-
ICOMMAND(uicolortext, "tife", (tagval *text, int *c, float *scale, uint *children),
3761-
buildtext(*text, *scale, uitextscale, Color(*c), -1, -1, false, children));
3760+
ICOMMAND(uicolortext, "tifieN", (tagval *text, int *c, float *scale, int *cursor, uint *children, int *numargs),
3761+
buildtext(*text, *scale, uitextscale, Color(*c), -1, *numargs>=4 ? *cursor : -1, *numargs>=4, children));
37623762

37633763
ICOMMAND(uitext, "tfieN", (tagval *text, float *scale, int *cursor, uint *children, int *numargs),
3764-
buildtext(*text, *scale, uitextscale, Color(255, 255, 255), -1, *numargs >= 3 ? *cursor : -1, *numargs >= 3, children));
3764+
buildtext(*text, *scale, uitextscale, Color(255, 255, 255), -1, *numargs>=3 ? *cursor : -1, *numargs>=3, children));
37653765

37663766
ICOMMAND(uitextfill, "ffe", (float *minw, float *minh, uint *children),
37673767
BUILD(Filler, o, o->setup(*minw * uitextscale*0.5f, *minh * uitextscale), children));
37683768

3769-
ICOMMAND(uiwrapcolortext, "tfife", (tagval *text, float *wrap, int *c, float *scale, uint *children),
3770-
buildtext(*text, *scale, uitextscale, Color(*c), *wrap, -1, false, children));
3769+
ICOMMAND(uiwrapcolortext, "tfifieN", (tagval *text, float *wrap, int *c, float *scale, int *cursor, uint *children, int *numargs),
3770+
buildtext(*text, *scale, uitextscale, Color(*c), *wrap, *numargs>=5 ? *cursor : -1, *numargs>=5, children));
37713771

3772-
ICOMMAND(uiwraptext, "tffe", (tagval *text, float *wrap, float *scale, uint *children),
3773-
buildtext(*text, *scale, uitextscale, Color(255, 255, 255), *wrap, -1, false, children));
3772+
ICOMMAND(uiwraptext, "tffieN", (tagval *text, float *wrap, float *scale, int *cursor, uint *children, int *numargs),
3773+
buildtext(*text, *scale, uitextscale, Color(255, 255, 255), *wrap, *numargs>=4 ? *cursor : -1, *numargs>=4, children));
37743774

37753775
ICOMMAND(uicolorcontext, "tife", (tagval *text, int *c, float *scale, uint *children),
37763776
buildtext(*text, *scale, FONTH*uicontextscale, Color(*c), -1, -1, false, children));

0 commit comments

Comments
 (0)