[Commits] [wesnoth/wesnoth] ce7738: Fix an assertion failure in the GUI2 placement.

GitHub noreply at github.com
Mon Jun 9 13:14:31 UTC 2014


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: ce773892a16308516216951659621798c0c9e6a8
      https://github.com/wesnoth/wesnoth/commit/ce773892a16308516216951659621798c0c9e6a8
  Author: Mark de Wever <koraq at xs4all.nl>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M changelog
    M src/gui/widgets/scrollbar_container.cpp

  Log Message:
  -----------
  Fix an assertion failure in the GUI2 placement.

If a vertical scrollbar is added to a widget its size is recalculated.
Unfortunalty the determination of the minimum width didn't take the
horizontal scrollbar in account. This lead to the container to be too
small for a widget with horizontal and vertical scrollbar causing the
placement to fail.

Fixes bug #22095, possibly #15615 and #21785.


  Commit: 1be5aebc281d0fafc7d461f7ab6ffb4521e01b4c
      https://github.com/wesnoth/wesnoth/commit/1be5aebc281d0fafc7d461f7ab6ffb4521e01b4c
  Author: Mark de Wever <koraq at xs4all.nl>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M changelog
    M src/gui/widgets/listbox.cpp
    M src/gui/widgets/listbox.hpp

  Log Message:
  -----------
  Let listboxs update its contents when adding rows.

Before only remove reduced the size, now the adding also updates contents.
This should reduce the number of layout updates.


  Commit: b57f9c81f31987a8714f9182a54f461ee9c35eff
      https://github.com/wesnoth/wesnoth/commit/b57f9c81f31987a8714f9182a54f461ee9c35eff
  Author: Mark de Wever <koraq at xs4all.nl>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M changelog
    M src/gui/widgets/toggle_panel.cpp

  Log Message:
  -----------
  Avoid calling the change callback twice.

This caused issues with the gamestate inspector in combination with the
provious commit. Since the code only seems to be required for the
experimental MP lobby it has been disabled.


  Commit: ea1a6fbe0f2709cbda947a0bde56da6a89a14cd8
      https://github.com/wesnoth/wesnoth/commit/ea1a6fbe0f2709cbda947a0bde56da6a89a14cd8
  Author: Mark de Wever <koraq at xs4all.nl>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M src/gui/dialogs/gamestate_inspector.cpp

  Log Message:
  -----------
  Remove redundant window invalidations.

The other commits in this branch make the calls to invalidate_layout()
redundant.


  Commit: 7efb1ba73b7c639246cb8ba2b84ddab88f49454f
      https://github.com/wesnoth/wesnoth/commit/7efb1ba73b7c639246cb8ba2b84ddab88f49454f
  Author: Mark de Wever <koraq at xs4all.nl>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M changelog
    M src/gui/dialogs/gamestate_inspector.cpp
    M src/gui/widgets/listbox.cpp
    M src/gui/widgets/listbox.hpp
    M src/gui/widgets/scrollbar_container.cpp
    M src/gui/widgets/toggle_panel.cpp

  Log Message:
  -----------
  Merge branch 'gamestate_dialogue_improvements'

Improves the gamestate inspection dialogue. It fixes a long-standing
assertion issue and also reduces the amount of redundant work done.

Note the dialogue can still be improved further, but the currently
shown dialogue is /a/ valid way to show its contents.

The merge fixes bug #22095, possibly #15615 and #21785.


Compare: https://github.com/wesnoth/wesnoth/compare/26398fed080a...7efb1ba73b7c


More information about the Commits mailing list