GunChleoc has proposed merging
lp:~widelands-dev/widelands/buttons_constructor_cleanup into lp:widelands.
Commit message:
Replaced bools in Buttons with enum classes.
- Replaced 'permpressed' and 'flat' bools with enum class 'Style'.
- Replaced 'keep_image_size' with enum class 'ImageMode'.
- Removed 'bool const enabled = true' from constructors.
- Cleanup: Removed default parameters from constructor calls.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/buttons_constructor_cleanup/+merge/308042
Cleaned up too many bools in Button constructors to make code more readable.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/buttons_constructor_cleanup into lp:widelands.
=== modified file 'src/editor/ui_menus/player_menu.cc'
--- src/editor/ui_menus/player_menu.cc 2016-08-04 15:49:05 +
+++ src/editor/ui_menus/player_menu.cc 2016-10-10 12:59:45 +
@@ -72,8 +72,7 @@
20,
g_gr->images().get("images/ui_basic/but1.png"),
g_gr->images().get("images/ui_basic/scrollbar_up.png"),
- _("Add player"),
- parent.egbase().map().get_nrplayers() < MAX_PLAYERS),
+ _("Add player")),
remove_last_player_(this,
"remove_last_player",
5,
@@ -82,8 +81,7 @@
20,
g_gr->images().get("images/ui_basic/but1.png"),
g_gr->images().get("images/ui_basic/scrollbar_down.png"),
- _("Remove last player"),
- 1 < parent.egbase().map().get_nrplayers()),
+ _("Remove last player")),
tribenames_(eia().egbase().tribes().get_all_tribenames()) {
add_player_.sigclicked.connect(
boost::bind(&EditorPlayerMenu::clicked_add_player, boost::ref(*this)));
@@ -211,6 +209,8 @@
plr_set_pos_buts_[p - 1]->set_pic(player_image);
posy += size + spacing;
}
+ add_player_.set_enabled(nr_players < MAX_PLAYERS);
+ remove_last_player_.set_enabled(1 < nr_players);
set_inner_size(get_inner_w(), posy + spacing);
}
@@ -228,8 +228,6 @@
}
map.set_scenario_player_tribe(nr_players, tribenames_[0]);
eia().set_need_save(true);
- add_player_.set_enabled(nr_players < MAX_PLAYERS);
- remove_last_player_.set_enabled(true);
update();
}
@@ -252,9 +250,6 @@
set_starting_pos_clicked(nr_players);
}
map.set_nrplayers(nr_players);
- add_player_.set_enabled(nr_players < MAX_PLAYERS);
- remove_last_player_.set_enabled(1 < nr_players);
-
update();
// TODO(SirVer): Take steps when the player is referenced someplace. Not
// TODO(SirVer): currently possible in the editor though.
=== modified file 'src/editor/ui_menus/toolsize_menu.cc'
--- src/editor/ui_menus/toolsize_menu.cc 2016-08-04 15:49:05 +
+++ src/editor/ui_menus/toolsize_menu.cc 2016-10-10 12:59:45 +
@@ -46,9 +46,7 @@
20,
20,
g_gr->images().get("images/ui_basic/but0.png"),
- g_gr->images().get("images/ui_basic/scrollbar_up.png"),
- std::string(),
- parent.get_sel_radius() < MAX_TOOL_AREA),
+ g_gr->images().get("images/ui_basic/scrollbar_up.png")),
decrease_(this,
"decr",
get_inner_w() / 2 + 10,
@@ -56,9 +54,7 @@
20,
20,
g_gr->images().get("images/ui_basic/but0.png"),
- g_gr->images().get("images/ui_basic/scrollbar_down.png"),
- std::string(),
- 0 < parent.get_sel_radius()),
+ g_gr->images().get("images/ui_basic/scrollbar_down.png")),
value_(0) {
increase_.sigclicked.connect(
boost::bind(&EditorToolsizeMenu::increase_radius, boost::ref(*this)));
=== modified file 'src/ui_basic/button.cc'
--- src/ui_basic/button.cc 2016-08-04 15:49:05 +
+++ src/ui_basic/button.cc 2016-10-10 12:59:45 +
@@ -43,17 +43,14 @@
const Image* bg_pic,
const std::string& title_text,
const std::string& tooltip_text,
-bool const init_enabled,
-bool const flat)
+UI::Button::Style init_style)
: NamedPanel(parent, name, x, y, w, h, tooltip_text),
highlighted_(false),
pressed_(false),
- permpressed_(false),
- enabled_(init_enabled),
+ enabled_(true),
+ style_(init_style),
repeating_(false),
- flat_(flat),
- keep_image_size_(false),
- draw_flat_background_(false),
+ image_mode_(UI::Button::ImageMode::kShrink),
time_nextact_(0),
title_(title_text),
pic_background_(bg_pic),
@@ -80,18 +77,15 @@
const Image* bg_pic,
const Image* fg_pic,
const std::string& tooltip_text,
-bool const init_enabled,
-bool const flat,
-const bool keep_image_size)
+UI::Button::Style init_style,
+ImageM
