From f7fe764b7eb8c9dd0f3299ee263d9644625015a5 Mon Sep 17 00:00:00 2001 From: Matlo Date: Thu, 7 Apr 2016 20:52:10 +0200 Subject: [PATCH] Allow values higher than 2.00 for the acceleration parameter #379 --- config/gimx-config.cpp | 8 ++------ config/wxsmith/configframe.wxs | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/config/gimx-config.cpp b/config/gimx-config.cpp index ba41b312..c5581842 100644 --- a/config/gimx-config.cpp +++ b/config/gimx-config.cpp @@ -1053,7 +1053,7 @@ configFrame::configFrame(wxString file,wxWindow* parent,wxWindowID id) FlexGridSizer30->Add(AxisTabSensitivity, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); AxisTabAcceleration = new wxTextCtrl(PanelAxis, ID_TEXTCTRL10, wxEmptyString, wxDefaultPosition, wxSize(55,-1), 0, wxDefaultValidator, _T("ID_TEXTCTRL10")); AxisTabAcceleration->Disable(); - AxisTabAcceleration->SetToolTip(_("Acceleration [0.00..2.00]")); + AxisTabAcceleration->SetToolTip(_("Acceleration [0.00..]")); FlexGridSizer30->Add(AxisTabAcceleration, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); AxisTabShape = new wxChoice(PanelAxis, ID_CHOICE1, wxDefaultPosition, wxDefaultSize, 0, 0, 0, wxDefaultValidator, _T("ID_CHOICE1")); AxisTabShape->SetSelection( AxisTabShape->Append(wxEmptyString) ); @@ -3328,11 +3328,7 @@ void configFrame::OnTextCtrl(wxCommandEvent& event) } else if(value < 0) { - text->SetValue(wxT("0.00")); - } - else if(value > 2) - { - text->SetValue(wxT("2.00")); + text->SetValue(wxT("1.00")); } } else if(text == MouseOptionsBuffer) diff --git a/config/wxsmith/configframe.wxs b/config/wxsmith/configframe.wxs index e741610a..52d2e90b 100644 --- a/config/wxsmith/configframe.wxs +++ b/config/wxsmith/configframe.wxs @@ -1498,7 +1498,7 @@ 55,-1 0 - Acceleration [0.00..2.00] + Acceleration [0.00..] wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL