From 589749c2cf152957acb81241a0a6b15dc12b20bb Mon Sep 17 00:00:00 2001 From: ChillerDragon Date: Fri, 27 Apr 2018 01:40:59 +0200 Subject: [PATCH 1/3] Allows low mousesens Lower minimum mousesens value to avoid confusion. Responing to GG Kid's request: https://forum.ddnet.tw/viewtopic.php?f=45&t=5807&p=58207&hilit=mousesens#p58207 --- src/engine/shared/config_variables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h index 2c3f6e31d..1346d4da4 100644 --- a/src/engine/shared/config_variables.h +++ b/src/engine/shared/config_variables.h @@ -128,7 +128,7 @@ MACRO_CONFIG_INT(GfxQuadAsTriangle, gfx_quad_as_triangle, 0, 0, 0, CFGFLAG_SAVE| MACRO_CONFIG_INT(GfxQuadAsTriangle, gfx_quad_as_triangle, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Render quads as triangles (fixes quad coloring on some GPUs)") #endif -MACRO_CONFIG_INT(InpMousesens, inp_mousesens, 200, 5, 100000, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Mouse sensitivity") +MACRO_CONFIG_INT(InpMousesens, inp_mousesens, 200, 1, 100000, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Mouse sensitivity") MACRO_CONFIG_INT(InpMouseOld, inp_mouseold, 0, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Use old mouse mode (warp mouse instead of raw input)") MACRO_CONFIG_INT(InpIgnoredModifiers, inp_ignored_modifiers, 0, 0, 65536, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Ignored keyboard modifier mask") From 4fe6a23d0c9c61b8174ad9f9a3b425a9a9e1e724 Mon Sep 17 00:00:00 2001 From: ChillerDragon Date: Tue, 1 May 2018 17:23:14 +0200 Subject: [PATCH 2/3] Allow low mosesens in menu --- src/game/variables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/variables.h b/src/game/variables.h index f8090040f..c6b7127be 100644 --- a/src/game/variables.h +++ b/src/game/variables.h @@ -86,7 +86,7 @@ MACRO_CONFIG_INT(UiPage, ui_page, 9, 0, 11, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Interf MACRO_CONFIG_INT(UiToolboxPage, ui_toolbox_page, 0, 0, 2, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Toolbox page") MACRO_CONFIG_STR(UiServerAddress, ui_server_address, 64, "localhost:8303", CFGFLAG_CLIENT|CFGFLAG_SAVE, "Interface server address") MACRO_CONFIG_INT(UiScale, ui_scale, 100, 50, 150, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Interface scale") -MACRO_CONFIG_INT(UiMousesens, ui_mousesens, 200, 5, 100000, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Mouse sensitivity for menus/editor") +MACRO_CONFIG_INT(UiMousesens, ui_mousesens, 200, 1, 100000, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Mouse sensitivity for menus/editor") MACRO_CONFIG_INT(UiColorHue, ui_color_hue, 160, 0, 255, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Interface color hue") MACRO_CONFIG_INT(UiColorSat, ui_color_sat, 70, 0, 255, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Interface color saturation") From e31f53f651b50d582829e9d6c79cc233ca00794d Mon Sep 17 00:00:00 2001 From: ChillerDragon Date: Tue, 1 May 2018 17:51:36 +0200 Subject: [PATCH 3/3] Fix ui for low mousesens --- src/game/client/components/menus_settings.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index 473916f42..41657913f 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -798,7 +798,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView) str_format(aBuf, sizeof(aBuf), "%s: %i", Localize("Mouse sens."), g_Config.m_InpMousesens); UI()->DoLabel(&Label, aBuf, 14.0f*UI()->Scale(), -1); Button.HMargin(2.0f, &Button); - int NewValue = (int)(DoScrollbarH(&g_Config.m_InpMousesens, &Button, (min(g_Config.m_InpMousesens, 500)-5)/500.0f)*500.0f)+5; + int NewValue = (int)(DoScrollbarH(&g_Config.m_InpMousesens, &Button, (min(g_Config.m_InpMousesens, 500)-1)/500.0f)*500.0f)+1; if(g_Config.m_InpMousesens < 500 || NewValue < 500) g_Config.m_InpMousesens = min(NewValue, 500); MovementSettings.HSplitTop(20.0f, 0, &MovementSettings); @@ -811,7 +811,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView) str_format(aBuf, sizeof(aBuf), "%s: %i", Localize("UI mouse s."), g_Config.m_UiMousesens); UI()->DoLabel(&Label, aBuf, 14.0f*UI()->Scale(), -1); Button.HMargin(2.0f, &Button); - int NewValue = (int)(DoScrollbarH(&g_Config.m_UiMousesens, &Button, (min(g_Config.m_UiMousesens, 500)-5)/500.0f)*500.0f)+5; + int NewValue = (int)(DoScrollbarH(&g_Config.m_UiMousesens, &Button, (min(g_Config.m_UiMousesens, 500)-1)/500.0f)*500.0f)+1; if(g_Config.m_UiMousesens < 500 || NewValue < 500) g_Config.m_UiMousesens = min(NewValue, 500); MovementSettings.HSplitTop(20.0f, 0, &MovementSettings);