[Commits] [wesnoth/wesnoth] 12c904: GUI2/Settings: minor formatting cleanup

GitHub noreply at github.com
Sun Aug 20 04:34:50 UTC 2017 

  Branch: refs/heads/some_gui2_refactoring
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 12c904ccae734129f0b436f3b942c81a168c0bd6
      https://github.com/wesnoth/wesnoth/commit/12c904ccae734129f0b436f3b942c81a168c0bd6
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-08-20 (Sun, 20 Aug 2017)

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

  Log Message:
  -----------
  GUI2/Settings: minor formatting cleanup


  Commit: 9275679a997114c41d215254bd1725b1c5236021
      https://github.com/wesnoth/wesnoth/commit/9275679a997114c41d215254bd1725b1c5236021
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-08-20 (Sun, 20 Aug 2017)

  Changed paths:
    M src/gui/core/window_builder.cpp
    M src/gui/core/window_builder.hpp

  Log Message:
  -----------
  GUI2/Window Builder: added function to generate a single widget instance with its builder

This will be used in some upcoming changes. The main benefit of this over directly initializing a new widget
object is any extra builder steps can also be executed.

I'm not entirely happy with the design, though, especially with having to specify both the type and type ID...


  Commit: 13f8359da59f5cd065930df7e91592fc9a6c21b1
      https://github.com/wesnoth/wesnoth/commit/13f8359da59f5cd065930df7e91592fc9a6c21b1
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-08-20 (Sun, 20 Aug 2017)

  Changed paths:
    M src/gui/dialogs/drop_down_menu.cpp
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/widgets/addon_list.cpp
    M src/gui/widgets/addon_list.hpp
    M src/gui/widgets/button.cpp
    M src/gui/widgets/button.hpp
    M src/gui/widgets/chatbox.cpp
    M src/gui/widgets/chatbox.hpp
    M src/gui/widgets/container_base.cpp
    M src/gui/widgets/container_base.hpp
    M src/gui/widgets/drawing.cpp
    M src/gui/widgets/drawing.hpp
    M src/gui/widgets/horizontal_scrollbar.cpp
    M src/gui/widgets/horizontal_scrollbar.hpp
    M src/gui/widgets/image.cpp
    M src/gui/widgets/image.hpp
    M src/gui/widgets/label.cpp
    M src/gui/widgets/label.hpp
    M src/gui/widgets/listbox.cpp
    M src/gui/widgets/listbox.hpp
    M src/gui/widgets/menu_button.cpp
    M src/gui/widgets/menu_button.hpp
    M src/gui/widgets/minimap.cpp
    M src/gui/widgets/minimap.hpp
    M src/gui/widgets/multi_page.cpp
    M src/gui/widgets/multi_page.hpp
    M src/gui/widgets/multimenu_button.cpp
    M src/gui/widgets/multimenu_button.hpp
    M src/gui/widgets/panel.cpp
    M src/gui/widgets/panel.hpp
    M src/gui/widgets/password_box.cpp
    M src/gui/widgets/password_box.hpp
    M src/gui/widgets/progress_bar.cpp
    M src/gui/widgets/progress_bar.hpp
    M src/gui/widgets/repeating_button.cpp
    M src/gui/widgets/repeating_button.hpp
    M src/gui/widgets/scroll_label.cpp
    M src/gui/widgets/scroll_label.hpp
    M src/gui/widgets/scrollbar.cpp
    M src/gui/widgets/scrollbar.hpp
    M src/gui/widgets/scrollbar_container.cpp
    M src/gui/widgets/scrollbar_container.hpp
    M src/gui/widgets/scrollbar_panel.cpp
    M src/gui/widgets/scrollbar_panel.hpp
    M src/gui/widgets/size_lock.cpp
    M src/gui/widgets/size_lock.hpp
    M src/gui/widgets/slider.cpp
    M src/gui/widgets/slider.hpp
    M src/gui/widgets/spacer.cpp
    M src/gui/widgets/spacer.hpp
    M src/gui/widgets/stacked_widget.cpp
    M src/gui/widgets/stacked_widget.hpp
    M src/gui/widgets/styled_widget.cpp
    M src/gui/widgets/styled_widget.hpp
    M src/gui/widgets/text_box.cpp
    M src/gui/widgets/text_box.hpp
    M src/gui/widgets/text_box_base.cpp
    M src/gui/widgets/text_box_base.hpp
    M src/gui/widgets/toggle_button.cpp
    M src/gui/widgets/toggle_button.hpp
    M src/gui/widgets/toggle_panel.cpp
    M src/gui/widgets/toggle_panel.hpp
    M src/gui/widgets/tree_view.cpp
    M src/gui/widgets/tree_view.hpp
    M src/gui/widgets/unit_preview_pane.cpp
    M src/gui/widgets/unit_preview_pane.hpp
    M src/gui/widgets/vertical_scrollbar.cpp
    M src/gui/widgets/vertical_scrollbar.hpp
    M src/gui/widgets/window.cpp

  Log Message:
  -----------
  GUI2: refactored widget initialization process

Essentially, this utilizes the second styled_widget overload that takes a builder reference to allow widgets
to initialize themselves without the extra init_control call. It also removes the need for extra functions such
as styled_widget::load_config_extra or styled_widget::init since the widget definition config and canvases are
loaded in the styled_widget ctor. Any code from the uses of the former function were moved either to widget
builders or their ctors.


  Commit: 4460647cf972cf029452f1158c88917f32b9fef4
      https://github.com/wesnoth/wesnoth/commit/4460647cf972cf029452f1158c88917f32b9fef4
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-08-20 (Sun, 20 Aug 2017)

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

  Log Message:
  -----------
  GUI2/Window: pass definition pointer to ctor instead of individual arguments


  Commit: d916218c0f71ef459b7b67dba4b5b14070b72038
      https://github.com/wesnoth/wesnoth/commit/d916218c0f71ef459b7b67dba4b5b14070b72038
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-08-20 (Sun, 20 Aug 2017)

  Changed paths:
    M src/gui/core/register_widget.hpp
    M src/gui/core/window_builder.cpp
    M src/gui/core/window_builder.hpp

  Log Message:
  -----------
  GUI2/Window Builder: renamed a function for clarity and used it in a few more places for consistency


  Commit: 7d71842b20f09407921d2866efd0fc628a8fb3fc
      https://github.com/wesnoth/wesnoth/commit/7d71842b20f09407921d2866efd0fc628a8fb3fc
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-08-20 (Sun, 20 Aug 2017)

  Changed paths:
    M src/gui/core/register_widget.hpp
    M src/gui/widgets/addon_list.hpp
    M src/gui/widgets/button.cpp
    M src/gui/widgets/button.hpp
    M src/gui/widgets/chatbox.cpp
    M src/gui/widgets/chatbox.hpp
    M src/gui/widgets/drawing.cpp
    M src/gui/widgets/drawing.hpp
    M src/gui/widgets/horizontal_scrollbar.cpp
    M src/gui/widgets/horizontal_scrollbar.hpp
    M src/gui/widgets/image.cpp
    M src/gui/widgets/image.hpp
    M src/gui/widgets/label.cpp
    M src/gui/widgets/label.hpp
    M src/gui/widgets/list.cpp
    M src/gui/widgets/list.hpp
    M src/gui/widgets/listbox.cpp
    M src/gui/widgets/listbox.hpp
    M src/gui/widgets/matrix.cpp
    M src/gui/widgets/matrix.hpp
    M src/gui/widgets/menu_button.cpp
    M src/gui/widgets/menu_button.hpp
    M src/gui/widgets/minimap.cpp
    M src/gui/widgets/minimap.hpp
    M src/gui/widgets/multi_page.cpp
    M src/gui/widgets/multi_page.hpp
    M src/gui/widgets/multimenu_button.cpp
    M src/gui/widgets/multimenu_button.hpp
    M src/gui/widgets/panel.cpp
    M src/gui/widgets/panel.hpp
    M src/gui/widgets/progress_bar.cpp
    M src/gui/widgets/progress_bar.hpp
    M src/gui/widgets/repeating_button.cpp
    M src/gui/widgets/repeating_button.hpp
    M src/gui/widgets/scroll_label.cpp
    M src/gui/widgets/scroll_label.hpp
    M src/gui/widgets/scrollbar_panel.cpp
    M src/gui/widgets/scrollbar_panel.hpp
    M src/gui/widgets/size_lock.hpp
    M src/gui/widgets/slider.cpp
    M src/gui/widgets/slider.hpp
    M src/gui/widgets/spacer.cpp
    M src/gui/widgets/spacer.hpp
    M src/gui/widgets/stacked_widget.cpp
    M src/gui/widgets/stacked_widget.hpp
    M src/gui/widgets/text_box.cpp
    M src/gui/widgets/text_box.hpp
    M src/gui/widgets/toggle_button.cpp
    M src/gui/widgets/toggle_button.hpp
    M src/gui/widgets/toggle_panel.cpp
    M src/gui/widgets/toggle_panel.hpp
    M src/gui/widgets/tree_view.cpp
    M src/gui/widgets/tree_view.hpp
    M src/gui/widgets/unit_preview_pane.cpp
    M src/gui/widgets/unit_preview_pane.hpp
    M src/gui/widgets/vertical_scrollbar.cpp
    M src/gui/widgets/vertical_scrollbar.hpp
    M src/gui/widgets/window.cpp
    M src/gui/widgets/window.hpp

  Log Message:
  -----------
  GUI2: allow REGISTER_WIDGET to implement get_control_type overrides

This is similar to what REGISER_WINDOW does with window_id().

Excludes the following class instances since they are not registered with REGISTER_WIDGET:
* tree_view_node
* scrollbar_container
* password_box (uses REGISTER_WIDGET3)


Compare: https://github.com/wesnoth/wesnoth/compare/12c904ccae73^...7d71842b20f0

More information about the Commits mailing list