Merge remote-tracking branch 'origin/terencehill/color_picker_carets'
authorSamual Lenks <samual@xonotic.org>
Sun, 29 Dec 2013 10:29:16 +0000 (05:29 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 29 Dec 2013 10:29:16 +0000 (05:29 -0500)
commitbf20397b0c62c9de0335ef9d70d60842fde9d0b2
tree25d7b392b258f9b5c2a2ad52c43c985db29f0954
parentcf8895a5790c2ae048c71e0f53bae6409a5500c1
parent64b349a338c5355c1b1381ef0987e34c24fae75b
Merge remote-tracking branch 'origin/terencehill/color_picker_carets'

# By terencehill
# Via terencehill
* origin/terencehill/color_picker_carets:
  Optimize a check
  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
  Improve detection of color codes when dragging the mouse in the color picker: color code isn't valid if caret is escaped (e.g. ^^x123)
qcsrc/common/util.qc
qcsrc/menu/xonotic/colorpicker.c