From 67936a26304834d00a13592296b5f5ac1789aaa4 Mon Sep 17 00:00:00 2001
From: Rachael Alexanderson <eruanna@drdteam.org>
Date: Sun, 10 Sep 2017 07:03:41 -0400
Subject: [PATCH] - added: m_showinputgrid == '-1' allows for on-screen
keyboard to never show, even when using a mouse
---
src/menu/menu.cpp | 2 +-
wadsrc/static/zscript/menu/textentermenu.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp
index 65a5d5a99..db0fd2efb 100644
--- a/src/menu/menu.cpp
+++ b/src/menu/menu.cpp
@@ -65,7 +65,7 @@
CVAR (Float, mouse_sensitivity, 1.f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
CVAR (Bool, show_messages, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
CVAR (Bool, show_obituaries, true, CVAR_ARCHIVE)
-CVAR(Bool, m_showinputgrid, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
+CVAR (Int, m_showinputgrid, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
CVAR(Bool, m_blockcontrollers, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
diff --git a/wadsrc/static/zscript/menu/textentermenu.txt b/wadsrc/static/zscript/menu/textentermenu.txt
index 69a6694f3..db38896b3 100644
--- a/wadsrc/static/zscript/menu/textentermenu.txt
+++ b/wadsrc/static/zscript/menu/textentermenu.txt
@@ -63,7 +63,7 @@ class TextEnterMenu : Menu
mEnterString = textbuffer;
mEnterSize = maxlen < 0 ? 0x7fffffff : maxlen;
mSizeMode = sizemode;
- mInputGridOkay = showgrid || m_showinputgrid;
+ mInputGridOkay = (showgrid && (m_showinputgrid == 0)) || (m_showinputgrid >= 1);
if (mEnterString.Length() > 0)
{
InputGridX = INPUTGRID_WIDTH - 1;