From c091c111f71b8452f481f15714cbc1f3d5f1fb7e Mon Sep 17 00:00:00 2001 From: terencehill Date: Tue, 27 Sep 2011 15:35:52 +0200 Subject: [PATCH] If there's a caret before the cursor in the input box when clicking on the color picker, escape the caret so we can add a valid color code --- qcsrc/menu/xonotic/colorpicker.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/qcsrc/menu/xonotic/colorpicker.c b/qcsrc/menu/xonotic/colorpicker.c index df9620696..781ca9a44 100644 --- a/qcsrc/menu/xonotic/colorpicker.c +++ b/qcsrc/menu/xonotic/colorpicker.c @@ -117,6 +117,15 @@ float XonoticColorpicker_mouseDrag(entity me, vector coords) break; } + if(substring(me.controlledTextbox.text, i-1, 1) == "^") + { + carets = 1; + while (i - 1 - carets >= 0 && substring(me.controlledTextbox.text, i - 1 - carets, 1) == "^") + ++carets; + if (carets == 1 || mod(carets, 2) == 1) // first check is just an optimization + me.controlledTextbox.enterText(me.controlledTextbox, "^"); // escape previous caret + } + vector margin; margin = me.imagemargin; if(coords_x >= margin_x) -- 2.39.2