From: Rudolf Polzer Date: Thu, 26 Jan 2012 12:02:41 +0000 (+0100) Subject: show boxes around inputbox too X-Git-Tag: xonotic-v0.6.0~93 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2734bbf35415e405424df669e2288cbee7797a4e;p=xonotic%2Fxonotic-data.pk3dir.git show boxes around inputbox too --- diff --git a/qcsrc/menu/item/inputbox.c b/qcsrc/menu/item/inputbox.c index 5b07afd4e..13351cfd3 100644 --- a/qcsrc/menu/item/inputbox.c +++ b/qcsrc/menu/item/inputbox.c @@ -287,11 +287,14 @@ void InputBox_draw(entity me) } else draw_Text(me.realOrigin - eX * me.scrollPos, me.text, me.realFontSize, '1 1 1', 1, 0); - // skipping SUPER(InputBox).draw(me); + if(!me.focused || (time - me.lastChangeTime) < floor(time - me.lastChangeTime) + 0.5) draw_Text(me.realOrigin + eX * (cursorPosInWidths - me.scrollPos), CURSOR, me.realFontSize, '1 1 1', 1, 0); draw_ClearClip(); + + // skipping SUPER(InputBox).draw(me); + Item_draw(me); } void InputBox_showNotify(entity me) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c index e3adc47fc..6862705b7 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c @@ -128,7 +128,7 @@ void XonoticPlayerSettingsTab_fill(entity me) setDependent(e, "crosshair_enabled", 1, 2); me.TR(me); me.TDempty(me, 0.1); - me.TD(me, 1, 0.8, e = makeXonoticRadioButton(5, string_null, string_null, _("Custom"))); + me.TD(me, 1, 0.9, e = makeXonoticRadioButton(5, string_null, string_null, _("Custom"))); setDependent(e, "crosshair_enabled", 1, 2); me.TD(me, 2, 2, e = makeXonoticColorpickerString("crosshair_color", "crosshair_color")); setDependentAND3(e, "crosshair_color_per_weapon", 0, 0, "crosshair_color_by_health", 0, 0, "crosshair_enabled", 1, 2);