0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3258 from jostephd/turbo_slider

Browse source 
Turbo slider
This commit is contained in:
Wedge009 2018-06-17 09:41:07 +10:00 • committed by GitHub
commit 203dd57571
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/gui/window/preferences/01_general.cfg
View file

@ -80,12 +80,12 @@
horizontal_grow = true
{_GUI_PREFERENCES_CHECKBOX_ALIGN_BORDER}
{_GUI_PREFERENCES_MAIN_COMPOSITE_SLIDER
( _ "Speed:")
( _ "Acceleration factor:")
turbo_slider (
# Starts at 0 since the slider values are used for vector index access.
minimum_value,maximum_value=0,11
step_size=1
tooltip= _ "Units move and fight speed"
tooltip= _ "Speed at which unit moves and animations play when 'Accelerated speed' is enabled."
)
}
[/column]

3
src/gui/dialogs/preferences_dialog.cpp
View file

@ -359,8 +359,7 @@ void preferences_dialog::post_build(window& window)
scroll_speed, set_scroll_speed);
/* ACCELERATED SPEED */
register_bool("turbo_toggle", true, turbo, set_turbo,
[&](widget& w) { disable_widget_on_toggle<slider>(window, w, "turbo_slider"); }, true);
register_bool("turbo_toggle", true, turbo, set_turbo);
const auto accl_load = [this]()->int {
return std::distance(accl_speeds_.begin(), std::find(accl_speeds_.begin(), accl_speeds_.end(), turbo_speed()));