[Commits] [wesnoth/wesnoth] 227a12: Make tgrid a final class

GitHub noreply at github.com
Sun Nov 6 09:06:18 UTC 2016


  Branch: refs/heads/gui2-min-size-layout
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 227a12ba11a67ed072c4f7b3046c096298b9a79b
      https://github.com/wesnoth/wesnoth/commit/227a12ba11a67ed072c4f7b3046c096298b9a79b
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2016-11-06 (Sun, 06 Nov 2016)

  Changed paths:
    M src/gui/widgets/grid.hpp

  Log Message:
  -----------
  Make tgrid a final class

Tgrid doesn't have any protected members, and is clearly designed not to be
inherited. Enforce it.


  Commit: dbe643c208ed38173861d14773f1cccf3474c39b
      https://github.com/wesnoth/wesnoth/commit/dbe643c208ed38173861d14773f1cccf3474c39b
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2016-11-06 (Sun, 06 Nov 2016)

  Changed paths:
    M src/gui/widgets/grid.cpp
    M src/gui/widgets/grid.hpp

  Log Message:
  -----------
  Lay grid out after size reduction

And in particular, do not call calculate_best_size() because it clears
saved row/column sizes.


  Commit: c300064cc0f2e5ae5c59cee4faee07d90f7c8822
      https://github.com/wesnoth/wesnoth/commit/c300064cc0f2e5ae5c59cee4faee07d90f7c8822
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2016-11-06 (Sun, 06 Nov 2016)

  Changed paths:
    M src/gui/widgets/grid.cpp

  Log Message:
  -----------
  Demote the "failed to place a grid" message from error to info level


  Commit: 494d9014e3d3c8a3ad7096950ef2053fc4e33020
      https://github.com/wesnoth/wesnoth/commit/494d9014e3d3c8a3ad7096950ef2053fc4e33020
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2016-11-06 (Sun, 06 Nov 2016)

  Changed paths:
    M src/gui/widgets/grid.cpp

  Log Message:
  -----------
  Fix an assertion failure on opening gamestate inspector

The cause was that grids can now call place() for their child widgets
before it has been called for the grid itself. As a result, the size of the
grid is zero, and child widgets which try to fit inside the grid
(see tree_view.cpp:159-161) end up at zero size. In the case of
tree_view_node, attempting to place the node with zero size causes an
assertion failure.

Fixed by updating the size of the grid in request_reduce_* functions.


Compare: https://github.com/wesnoth/wesnoth/compare/cea1bc926fa7...494d9014e3d3


More information about the Commits mailing list