[Commits] [wesnoth/wesnoth] e1102b: fix bug #22984: sliders not adjustable with arrow ...

GitHub noreply at github.com
Thu Mar 5 20:00:18 UTC 2015


  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: e1102b394f85823f325147c326f8b8fe032774d2
      https://github.com/wesnoth/wesnoth/commit/e1102b394f85823f325147c326f8b8fe032774d2
  Author: Chris Beck <render787 at gmail.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M src/widgets/slider.cpp

  Log Message:
  -----------
  fix bug #22984: sliders not adjustable with arrow keys

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.

cf84e1d8aae84b76e7e9adc15847089bdc940632
49614599fa5211e0bc3fdba43c6255509da66022

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


  Commit: 641b001a92e7a18ca5ab2770324146f2616f2813
      https://github.com/wesnoth/wesnoth/commit/641b001a92e7a18ca5ab2770324146f2616f2813
  Author: Chris Beck <render787 at gmail.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M src/display.cpp
    M src/display.hpp
    M src/widgets/slider.cpp
    M src/widgets/slider.hpp

  Log Message:
  -----------
  fix zoom slider focus issue (add a separate class for zoom_slider)

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.


  Commit: e9ba369cc82876870de5699f06b0ab63fbf918f7
      https://github.com/wesnoth/wesnoth/commit/e9ba369cc82876870de5699f06b0ab63fbf918f7
  Author: Chris Beck <beck.ct at gmail.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M src/display.cpp
    M src/display.hpp
    M src/widgets/slider.cpp
    M src/widgets/slider.hpp

  Log Message:
  -----------
  Merge pull request #377 from cbeck88/fixup_sliders_1.12

Fixup sliders 1.12


Compare: https://github.com/wesnoth/wesnoth/compare/1c1ea6771071...e9ba369cc828


More information about the Commits mailing list