[Scummvm-git-logs] scummvm master -> 69e311b789ea2684642c89ab905cc2cbfb19f57e
wjp
wjp at usecode.org
Tue Feb 28 15:54:45 CET 2017
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
afff429261 SDL: fix options control tab ordering and labels
5934c05bca SDL: Fix value range checking for kbdMouseSpeedSlider
58bbc0e887 SDL: fix pointer speed setting 8 (was too slow)
69e311b789 Merge pull request #912 from rsn8887/upstream
Commit: afff429261a241f634249b1071a3811888d422bf
https://github.com/scummvm/scummvm/commit/afff429261a241f634249b1071a3811888d422bf
Author: rsn8887 (rsn8887 at users.noreply.github.com)
Date: 2017-02-26T12:04:37-06:00
Commit Message:
SDL: fix options control tab ordering and labels
- control options tab is moved past graphics options tab
- control tab is not the default anymore
- changed label of "Mouse Speed" option to "Pointer Speed"
- changed Pointer Speed infotip description to make it more clear
Changed paths:
gui/options.cpp
diff --git a/gui/options.cpp b/gui/options.cpp
index 955f655..80b4f30 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -122,8 +122,9 @@ static const char *savePeriodLabels[] = { _s("Never"), _s("every 5 mins"), _s("e
static const int savePeriodValues[] = { 0, 5 * 60, 10 * 60, 15 * 60, 30 * 60, -1 };
static const char *outputRateLabels[] = { _s("<default>"), _s("8 kHz"), _s("11 kHz"), _s("22 kHz"), _s("44 kHz"), _s("48 kHz"), 0 };
static const int outputRateValues[] = { 0, 8000, 11025, 22050, 44100, 48000, -1 };
+// The keyboard mouse speed values range from 0 to 7 and correspond to speeds shown in the label
+// "10" (value 3) is the default speed corresponding to the speed before introduction of this control
static const char *kbdMouseSpeedLabels[] = { _s("3"), _s("5"), _s("8"), _s("10"), _s("13"), _s("15"), _s("18"), _s("20"), 0 };
-static const int kbdMouseSpeedValues[] = { 0, 1, 2, 3, 4, 5, 6, 7, -1 };
OptionsDialog::OptionsDialog(const Common::String &domain, int x, int y, int w, int h)
: Dialog(x, y, w, h), _domain(domain), _graphicsTabId(-1), _midiTabId(-1), _pathsTabId(-1), _tabWidget(0) {
@@ -244,7 +245,7 @@ void OptionsDialog::build() {
int value = ConfMan.getInt("kbdmouse_speed", _domain);
if (_kbdMouseSpeedSlider && value < sizeof(kbdMouseSpeedLabels)) {
_kbdMouseSpeedSlider->setValue(value);
- _kbdMouseSpeedLabel->setLabel(kbdMouseSpeedLabels[value]);
+ _kbdMouseSpeedLabel->setLabel(_(kbdMouseSpeedLabels[value]));
}
}
}
@@ -435,37 +436,9 @@ void OptionsDialog::open() {
}
void OptionsDialog::apply() {
- // Control options
- if (_enableControlSettings) {
- if (g_system->hasFeature(OSystem::kFeatureOnScreenControl)) {
- if (ConfMan.getBool("onscreen_control", _domain) != _onscreenCheckbox->getState()) {
- g_system->setFeatureState(OSystem::kFeatureOnScreenControl, _onscreenCheckbox->getState());
- }
- }
- if (g_system->hasFeature(OSystem::kFeatureTouchpadMode)) {
- if (ConfMan.getBool("touchpad_mouse_mode", _domain) != _touchpadCheckbox->getState()) {
- g_system->setFeatureState(OSystem::kFeatureTouchpadMode, _touchpadCheckbox->getState());
- }
- }
- if (g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons)) {
- if (ConfMan.getBool("swap_menu_and_back_buttons", _domain) != _swapMenuAndBackBtnsCheckbox->getState()) {
- g_system->setFeatureState(OSystem::kFeatureSwapMenuAndBackButtons, _swapMenuAndBackBtnsCheckbox->getState());
- }
- }
- if (g_system->hasFeature(OSystem::kFeatureKbdMouseSpeed)) {
- if (ConfMan.getInt("kbdmouse_speed", _domain) != _kbdMouseSpeedSlider->getValue()) {
- ConfMan.setInt("kbdmouse_speed", _kbdMouseSpeedSlider->getValue(), _domain);
- }
- }
- if (g_system->hasFeature(OSystem::kFeatureJoystickDeadzone)) {
- if (ConfMan.getInt("joystick_deadzone", _domain) != _joystickDeadzoneSlider->getValue()) {
- ConfMan.setInt("joystick_deadzone", _joystickDeadzoneSlider->getValue(), _domain);
- }
- }
- }
+ bool graphicsModeChanged = false;
// Graphic options
- bool graphicsModeChanged = false;
if (_fullscreenCheckbox) {
if (_enableGraphicSettings) {
if (ConfMan.getBool("filtering", _domain) != _filteringCheckbox->getState())
@@ -575,7 +548,36 @@ void OptionsDialog::apply() {
dialog.runModal();
}
}
-
+
+ // Control options
+ if (_enableControlSettings) {
+ if (g_system->hasFeature(OSystem::kFeatureOnScreenControl)) {
+ if (ConfMan.getBool("onscreen_control", _domain) != _onscreenCheckbox->getState()) {
+ g_system->setFeatureState(OSystem::kFeatureOnScreenControl, _onscreenCheckbox->getState());
+ }
+ }
+ if (g_system->hasFeature(OSystem::kFeatureTouchpadMode)) {
+ if (ConfMan.getBool("touchpad_mouse_mode", _domain) != _touchpadCheckbox->getState()) {
+ g_system->setFeatureState(OSystem::kFeatureTouchpadMode, _touchpadCheckbox->getState());
+ }
+ }
+ if (g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons)) {
+ if (ConfMan.getBool("swap_menu_and_back_buttons", _domain) != _swapMenuAndBackBtnsCheckbox->getState()) {
+ g_system->setFeatureState(OSystem::kFeatureSwapMenuAndBackButtons, _swapMenuAndBackBtnsCheckbox->getState());
+ }
+ }
+ if (g_system->hasFeature(OSystem::kFeatureKbdMouseSpeed)) {
+ if (ConfMan.getInt("kbdmouse_speed", _domain) != _kbdMouseSpeedSlider->getValue()) {
+ ConfMan.setInt("kbdmouse_speed", _kbdMouseSpeedSlider->getValue(), _domain);
+ }
+ }
+ if (g_system->hasFeature(OSystem::kFeatureJoystickDeadzone)) {
+ if (ConfMan.getInt("joystick_deadzone", _domain) != _joystickDeadzoneSlider->getValue()) {
+ ConfMan.setInt("joystick_deadzone", _joystickDeadzoneSlider->getValue(), _domain);
+ }
+ }
+ }
+
// Volume options
if (_musicVolumeSlider) {
if (_enableVolumeSettings) {
@@ -776,7 +778,7 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
draw();
break;
case kKbdMouseSpeedChanged:
- _kbdMouseSpeedLabel->setLabel(kbdMouseSpeedLabels[_kbdMouseSpeedSlider->getValue()]);
+ _kbdMouseSpeedLabel->setLabel(_(kbdMouseSpeedLabels[_kbdMouseSpeedSlider->getValue()]));
_kbdMouseSpeedLabel->draw();
break;
case kJoystickDeadzoneChanged:
@@ -940,10 +942,10 @@ void OptionsDialog::addControlControls(GuiObject *boss, const Common::String &pr
// Keyboard and joystick mouse speed
if (g_system->hasFeature(OSystem::kFeatureKbdMouseSpeed)) {
if (g_system->getOverlayWidth() > 320)
- _kbdMouseSpeedDesc = new StaticTextWidget(boss, prefix + "grKbdMouseSpeedDesc", _("Mouse Speed:"), _("Speed multiplier for mouse emulation"));
+ _kbdMouseSpeedDesc = new StaticTextWidget(boss, prefix + "grKbdMouseSpeedDesc", _("Pointer Speed:"), _("Speed for keyboard/joystick mouse pointer control"));
else
- _kbdMouseSpeedDesc = new StaticTextWidget(boss, prefix + "grKbdMouseSpeedDesc", _c("Mouse Speed:", "lowres"), _("Speed multiplier for mouse emulation"));
- _kbdMouseSpeedSlider = new SliderWidget(boss, prefix + "grKbdMouseSpeedSlider", _("Speed multiplier for mouse emulation"), kKbdMouseSpeedChanged);
+ _kbdMouseSpeedDesc = new StaticTextWidget(boss, prefix + "grKbdMouseSpeedDesc", _c("Pointer Speed:", "lowres"), _("Speed for keyboard/joystick mouse pointer control"));
+ _kbdMouseSpeedSlider = new SliderWidget(boss, prefix + "grKbdMouseSpeedSlider", _("Speed for keyboard/joystick mouse pointer control"), kKbdMouseSpeedChanged);
_kbdMouseSpeedLabel = new StaticTextWidget(boss, prefix + "grKbdMouseSpeedLabel", " ");
_kbdMouseSpeedSlider->setMinValue(0);
_kbdMouseSpeedSlider->setMaxValue(7);
@@ -953,10 +955,10 @@ void OptionsDialog::addControlControls(GuiObject *boss, const Common::String &pr
// Joystick deadzone
if (g_system->hasFeature(OSystem::kFeatureJoystickDeadzone)) {
if (g_system->getOverlayWidth() > 320)
- _joystickDeadzoneDesc = new StaticTextWidget(boss, prefix + "grJoystickDeadzoneDesc", _("Joy Deadzone:"), _("Analog Joystick Deadzone"));
+ _joystickDeadzoneDesc = new StaticTextWidget(boss, prefix + "grJoystickDeadzoneDesc", _("Joy Deadzone:"), _("Analog joystick Deadzone"));
else
- _joystickDeadzoneDesc = new StaticTextWidget(boss, prefix + "grJoystickDeadzoneDesc", _c("Joy Deadzone:", "lowres"), _("Analog Joystick Deadzone"));
- _joystickDeadzoneSlider = new SliderWidget(boss, prefix + "grJoystickDeadzoneSlider", _("Analog Joystick Deadzone"), kJoystickDeadzoneChanged);
+ _joystickDeadzoneDesc = new StaticTextWidget(boss, prefix + "grJoystickDeadzoneDesc", _c("Joy Deadzone:", "lowres"), _("Analog joystick Deadzone"));
+ _joystickDeadzoneSlider = new SliderWidget(boss, prefix + "grJoystickDeadzoneSlider", _("Analog joystick Deadzone"), kJoystickDeadzoneChanged);
_joystickDeadzoneLabel = new StaticTextWidget(boss, prefix + "grJoystickDeadzoneLabel", " ");
_joystickDeadzoneSlider->setMinValue(1);
_joystickDeadzoneSlider->setMaxValue(10);
@@ -1414,6 +1416,12 @@ void GlobalOptionsDialog::build() {
TabWidget *tab = new TabWidget(this, "GlobalOptions.TabWidget");
//
+ // 1) The graphics tab
+ //
+ _graphicsTabId = tab->addTab(g_system->getOverlayWidth() > 320 ? _("Graphics") : _("GFX"));
+ addGraphicControls(tab, "GlobalOptions_Graphics.");
+
+ //
// The control tab (currently visible only for AndroidSDL, SDL, and Vita platform, visibility checking by features
//
if (g_system->hasFeature(OSystem::kFeatureTouchpadMode) ||
@@ -1424,12 +1432,6 @@ void GlobalOptionsDialog::build() {
tab->addTab(_("Control"));
addControlControls(tab, "GlobalOptions_Control.");
}
-
- //
- // 1) The graphics tab
- //
- _graphicsTabId = tab->addTab(g_system->getOverlayWidth() > 320 ? _("Graphics") : _("GFX"));
- addGraphicControls(tab, "GlobalOptions_Graphics.");
//
// 2) The audio tab
Commit: 5934c05bca1f09d55d9689c86b12b59a35eb23cd
https://github.com/scummvm/scummvm/commit/5934c05bca1f09d55d9689c86b12b59a35eb23cd
Author: rsn8887 (rsn8887 at users.noreply.github.com)
Date: 2017-02-27T16:20:09-06:00
Commit Message:
SDL: Fix value range checking for kbdMouseSpeedSlider
Changed paths:
gui/options.cpp
diff --git a/gui/options.cpp b/gui/options.cpp
index 80b4f30..f9c0541 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -243,7 +243,7 @@ void OptionsDialog::build() {
if (g_system->hasFeature(OSystem::kFeatureKbdMouseSpeed)) {
if (ConfMan.hasKey("kbdmouse_speed", _domain)) {
int value = ConfMan.getInt("kbdmouse_speed", _domain);
- if (_kbdMouseSpeedSlider && value < sizeof(kbdMouseSpeedLabels)) {
+ if (_kbdMouseSpeedSlider && value < ARRAYSIZE(kbdMouseSpeedLabels) - 1 && value >= 0) {
_kbdMouseSpeedSlider->setValue(value);
_kbdMouseSpeedLabel->setLabel(_(kbdMouseSpeedLabels[value]));
}
Commit: 58bbc0e887cc28184f153a5f64f7ea1562f2a1d6
https://github.com/scummvm/scummvm/commit/58bbc0e887cc28184f153a5f64f7ea1562f2a1d6
Author: rsn8887 (rsn8887 at users.noreply.github.com)
Date: 2017-02-27T19:59:18-06:00
Commit Message:
SDL: fix pointer speed setting 8 (was too slow)
Changed paths:
backends/events/sdl/sdl-events.cpp
diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index 8c11944..9a9d652 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -245,7 +245,7 @@ bool SdlEventSource::handleKbdMouse(Common::Event &event) {
break;
// 0.75 speed
case 2:
- speedFactor = 37;
+ speedFactor = 33;
break;
// 1.0 speed
case 3:
Commit: 69e311b789ea2684642c89ab905cc2cbfb19f57e
https://github.com/scummvm/scummvm/commit/69e311b789ea2684642c89ab905cc2cbfb19f57e
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2017-02-28T15:54:40+01:00
Commit Message:
Merge pull request #912 from rsn8887/upstream
SDL: fix options control tab ordering and labels
Changed paths:
backends/events/sdl/sdl-events.cpp
gui/options.cpp
More information about the Scummvm-git-logs
mailing list