[Commits] [wesnoth/wesnoth] 6f1a13: GUI2/Image: added tiled-to-size image definition

GitHub noreply at github.com
Sun Jul 30 17:34:18 UTC 2017


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 6f1a13c3a65f931a8069428cf986a7f2e566e8d9
      https://github.com/wesnoth/wesnoth/commit/6f1a13c3a65f931a8069428cf986a7f2e566e8d9
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M data/gui/widget/image_default.cfg

  Log Message:
  -----------
  GUI2/Image: added tiled-to-size image definition


  Commit: 05210ae1f2f803d81cb8ee7b7a28b3d3a467da37
      https://github.com/wesnoth/wesnoth/commit/05210ae1f2f803d81cb8ee7b7a28b3d3a467da37
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M data/gui/widget/toggle_button_icon.cfg

  Log Message:
  -----------
  GUI2: fixed some overlay drawing issues with icon toggle buttons

Not sure why, but in some cases the overlay calculations were getting screwed up. This makes them use
the general centered image macro, with accompanying fallback safety checks.


  Commit: 5a902900507e66f20150076fde912bf7c592ad55
      https://github.com/wesnoth/wesnoth/commit/5a902900507e66f20150076fde912bf7c592ad55
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M data/gui/widget/image_default.cfg

  Log Message:
  -----------
  GUI2/Image: added scaled-to-size definition


  Commit: 02ed22b8f273a7b4f3397ef8a6ee08b300487e59
      https://github.com/wesnoth/wesnoth/commit/02ed22b8f273a7b4f3397ef8a6ee08b300487e59
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M data/gui/widget/toggle_button_icon.cfg

  Log Message:
  -----------
  GUI2/Toggle Button: added medium-sized icon button definition


  Commit: fd7877c26c9a7693615b74462dde9602e8d9028d
      https://github.com/wesnoth/wesnoth/commit/fd7877c26c9a7693615b74462dde9602e8d9028d
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

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

  Log Message:
  -----------
  GUI2/Addon Manager: removed some excessive borders in the low resolution definition


  Commit: e724bdf483f485e299bdc12a8b5b19c6d43b76de
      https://github.com/wesnoth/wesnoth/commit/e724bdf483f485e299bdc12a8b5b19c6d43b76de
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M src/gui/core/event/handler.cpp
    M src/gui/core/event/handler.hpp
    M src/gui/dialogs/modal_dialog.cpp

  Log Message:
  -----------
  GUI2/Modal Dialog: don't use pop_back to remove window ptr from open window stack

This seems to have been the cause of some crashes and weird behavior with the new command console.
Likely the problem came from the wrong pointer being removed from the ows, but exactly why a modal
dialog was even being opened I don't know.

Still, this is a safer method overall and it guarantees the correct pointer is always removed.


  Commit: db44561d334c0a0b81543c21e2f57e6f50111f4d
      https://github.com/wesnoth/wesnoth/commit/db44561d334c0a0b81543c21e2f57e6f50111f4d
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M src/gui/dialogs/modeless_dialog.cpp
    M src/gui/dialogs/modeless_dialog.hpp

  Log Message:
  -----------
  GUI2/Modeless Dialog: minor cleanup, implement a TODO

* Use a unique_ptr for the window member.
* Made use of the new remove_from_window_stack function (its impl was copied from this code)
* Only attempt ows removal if window display mode is modeless (since if mode is tooltip, no
  ptr was added to the list anyway.

# Conflicts:
#	src/gui/dialogs/modeless_dialog.cpp


  Commit: 2416f10dddaebd1629e2da711b878b1082bb60e8
      https://github.com/wesnoth/wesnoth/commit/2416f10dddaebd1629e2da711b878b1082bb60e8
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

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

  Log Message:
  -----------
  GUI2/Window: minor cleanup

Simplified a setter and added some members to the ctor initializer list.


  Commit: 813c0a50f9fe3a67d3988d82b3d64338e71b7515
      https://github.com/wesnoth/wesnoth/commit/813c0a50f9fe3a67d3988d82b3d64338e71b7515
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M src/gui/core/event/handler.cpp
    M src/gui/dialogs/modal_dialog.cpp
    M src/gui/dialogs/modal_dialog.hpp

  Log Message:
  -----------
  GUI2: made use of the great unique_ptr in a few places

# Conflicts:
#	src/gui/core/event/handler.cpp


  Commit: c29ea03212d90ac0764691025f457e6f285fdb64
      https://github.com/wesnoth/wesnoth/commit/c29ea03212d90ac0764691025f457e6f285fdb64
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M src/gui/dialogs/chat_log.cpp
    M src/gui/dialogs/chat_log.hpp
    M src/gui/dialogs/loading_screen.cpp
    M src/gui/dialogs/loading_screen.hpp
    M src/gui/dialogs/lua_interpreter.cpp
    M src/gui/dialogs/lua_interpreter.hpp

  Log Message:
  -----------
  GUI2: removed superfluous build_window methods from a few dialogs

build_window is *not* virtual in modal_dialog, not were these methods doing anything different from
modal_dialog's even if it were.


  Commit: 42d146979a4e14a7407b0806cd2a594f75d94c18
      https://github.com/wesnoth/wesnoth/commit/42d146979a4e14a7407b0806cd2a594f75d94c18
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M src/gui/dialogs/loading_screen.cpp
    M src/gui/dialogs/loading_screen.hpp

  Log Message:
  -----------
  GUI2/Loading Screen: cleaned up some unused stuff

For some reason, when I first implemented this dialog, I had it manage it own window pointer like modal_dialog
or modeless_dialog and display itself non-modal-y, despite being a modal dialog... IIRC it was probably some
ill-conceived attempt at "threading" so the game could load the config while it displayed. That's a moot point
now since the dialog was soon after refactored to use actual threading, rendering these bits useless.

# Conflicts:
#	src/gui/dialogs/loading_screen.cpp


Compare: https://github.com/wesnoth/wesnoth/compare/f818745c7210...42d146979a4e


More information about the Commits mailing list