[Commits] [wesnoth/wesnoth] 0475f8: WIP: a widget that forces its child widget to a fi...

GitHub noreply at github.com
Tue Nov 8 20:34:26 UTC 2016


  Branch: refs/heads/fixed-size-chatbox
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 0475f8d5d0d8231400f21ee26c63a8f38841d52b
      https://github.com/wesnoth/wesnoth/commit/0475f8d5d0d8231400f21ee26c63a8f38841d52b
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    M projectfiles/VC12/wesnoth.vcxproj
    M projectfiles/VC12/wesnoth.vcxproj.filters
    M src/CMakeLists.txt
    M src/SConscript
    M src/gui/widgets/container.hpp
    A src/gui/widgets/size_fixater.cpp
    A src/gui/widgets/size_fixater.hpp
    M src/gui/widgets/stacked_widget.cpp

  Log Message:
  -----------
  WIP: a widget that forces its child widget to a fixed size


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

  Changed paths:
    M projectfiles/VC12/wesnoth.vcxproj
    M projectfiles/VC12/wesnoth.vcxproj.filters
    M src/CMakeLists.txt
    M src/SConscript
    R src/gui/widgets/size_fixater.cpp
    R src/gui/widgets/size_fixater.hpp
    A src/gui/widgets/size_lock.cpp
    A src/gui/widgets/size_lock.hpp

  Log Message:
  -----------
  Minor fixes

* Renamed the widget from size_fixater to size_lock.
  Thanks @shikadilord for the suggestion.
* Fixed build with -Werror=reorder.
* Fixed: the line of size_fixater.cpp was indented with spaces
  in CMakeLists.txt.
* Added newlines to the end of the new files.


  Commit: 6da69a8260fd24776f817ea4bcfb3a6d3b21b6f1
      https://github.com/wesnoth/wesnoth/commit/6da69a8260fd24776f817ea4bcfb3a6d3b21b6f1
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    M data/gui/macros/_initial.cfg
    M data/gui/schema.cfg
    A data/gui/widget/size_lock_default.cfg

  Log Message:
  -----------
  The WML part


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

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

  Log Message:
  -----------
  Fix crashes

This commit fixes the wrapped widget not being found with find_widget(),
and the size_lock widget crashing on attempt to draw because of not having
any states.


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

  Changed paths:
    M data/gui/macros/_initial.cfg
    M data/gui/widget/size_lock_default.cfg

  Log Message:
  -----------
  Fix the wrapped widget not filling allocated size

Thanks @Vultraz for the fix.


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

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

  Log Message:
  -----------
  Allow either dimension to be zero

Because the containing grid will resize the size_lock to fill whichever
dimension that has space because of other widgets in the same grid,
specifying zero as either dimension is reasonable as long as they are not
both zero at the same time.


  Commit: 1b45958bc0fea5269f5b574941051ac77e67bc93
      https://github.com/wesnoth/wesnoth/commit/1b45958bc0fea5269f5b574941051ac77e67bc93
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    M data/gui/window/lobby_main.cfg
    M data/gui/window/mp_join_game.cfg
    M data/gui/window/mp_staging.cfg

  Log Message:
  -----------
  Lock sizes of most chat boxes

This commit leaves alone the chat box in the low-resolution version of MP
lobby because attempting to lock its size blocks it from being shown at
all, likely because of its width being specified as zero.

This fixes the chat box randomly becoming too large in the high-resolution
version of MP lobby.


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

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

  Log Message:
  -----------
  Handle the situation where the content initially wants to be too large


  Commit: 47db7a9ffd6c344da84eb9c22a6ce5285985c6d5
      https://github.com/wesnoth/wesnoth/commit/47db7a9ffd6c344da84eb9c22a6ce5285985c6d5
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    M data/gui/window/lobby_main.cfg

  Log Message:
  -----------
  Lock size of the chat box in the low-resolution MP lobby

No longer causes the lower grid to disappear with the previous commit
applied.


Compare: https://github.com/wesnoth/wesnoth/compare/faf7f6bceffe...47db7a9ffd6c


More information about the Commits mailing list