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

Fixup sliders 1.12 #377

Merged
merged 2 commits into from
Mar 5, 2015
Merged

Fixup sliders 1.12 #377

merged 2 commits into from
Mar 5, 2015

Conversation

cbeck88
Copy link
Member

@cbeck88 cbeck88 commented Mar 5, 2015

Backport of #376

This commit causes sliders to attract focus properly when their
grips are clicked on, and to respond to left and right arrow
presses again. It partly reverts two earlier commits that
affected this functionality.

cf84e1d
4961459

It causes the zoom slider to behave slightly badly, because it
does not lose focus when the user clicks elsewhere on the map.
But this bug should be fixed at the source and not by disabling
wanted functionality for all sliders.

Conflicts:
	src/widgets/slider.cpp
When the slider widget was added to ThemeWML, some work was not
done apparently to make it play nicely with regards to focus and
key events with the other theme wml widgets, causing it to retain
focus for keyboard events indefinitely. At the time this was
resolved by disabling these events, but this cripples the many
other sliders in the game. In this commit we introduce a subclass
zoom_slider which has this functionality disabled, and use that
for zoom sliders, so that we can get the desired functionality
back for the other sliders. See parent of this commit for more
info.
cbeck88 added a commit that referenced this pull request Mar 5, 2015
@cbeck88 cbeck88 merged commit e9ba369 into wesnoth:1.12 Mar 5, 2015
@cbeck88 cbeck88 deleted the fixup_sliders_1.12 branch March 6, 2015 04:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant