Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SDL: fix options control tab ordering and labels #912

Merged
merged 3 commits into from Feb 28, 2017
Merged

Conversation

@rsn8887
Copy link
Contributor

rsn8887 commented Feb 26, 2017

  • 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 that it affects the keyboard/joystick pointer control only
  • also made Pointer Speed labels translatable.
- 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
@@ -244,7 +245,7 @@ void OptionsDialog::build() {
int value = ConfMan.getInt("kbdmouse_speed", _domain);
if (_kbdMouseSpeedSlider && value < sizeof(kbdMouseSpeedLabels)) {

This comment has been minimized.

Copy link
@wjp

wjp Feb 27, 2017

Member

This shouldn't be sizeof, but ARRAYSIZE(kbdMouseSpeedLabels). Or maybe - 1 to avoid the 0 terminator. You should probably also check if value >= 0.

This comment has been minimized.

Copy link
@rsn8887

rsn8887 Feb 27, 2017

Author Contributor

fixed.

@wjp wjp mentioned this pull request Feb 27, 2017
@wjp wjp merged commit 69e311b into scummvm:master Feb 28, 2017
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@wjp
Copy link
Member

wjp commented Feb 28, 2017

Thanks

@rsn8887 rsn8887 deleted the rsn8887:upstream branch Mar 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.