GUI2: require existence of all widgets added to tab order

Not sure if window::add_to_tab_order should take a reference in this case.
wesnoth · Aug 25, 2017 · 79abf80 · 79abf80
1 parent 304702a
commit 79abf80
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/gui/dialogs/editor/custom_tod.cpp b/src/gui/dialogs/editor/custom_tod.cpp
@@ -123,8 +123,8 @@ void custom_tod::pre_show(window& window)
 		{"sound", tod_getter_sound}
 	};
 
-	window.add_to_tab_order(find_widget<text_box>(&window, "tod_name", false, false));
-	window.add_to_tab_order(find_widget<text_box>(&window, "tod_id", false, false));
+	window.add_to_tab_order(find_widget<text_box>(&window, "tod_name", false, true));
+	window.add_to_tab_order(find_widget<text_box>(&window, "tod_id", false, true));
 
 	for(const auto& data : metadata_stuff) {
 		find_widget<text_box>(&window, "path_" + data.first, false).set_active(false);

diff --git a/src/gui/dialogs/editor/edit_label.cpp b/src/gui/dialogs/editor/edit_label.cpp
@@ -86,8 +86,8 @@ editor_edit_label::editor_edit_label(std::string& text,
 
 void editor_edit_label::pre_show(window& win)
 {
-	win.add_to_tab_order(find_widget<text_box>(&win, "label", false, false));
-	win.add_to_tab_order(find_widget<text_box>(&win, "category", false, false));
+	win.add_to_tab_order(find_widget<text_box>(&win, "label", false, true));
+	win.add_to_tab_order(find_widget<text_box>(&win, "category", false, true));
 }
 
 void editor_edit_label::register_color_component(std::string widget_id, uint8_t color_t::* component) {

diff --git a/src/gui/dialogs/editor/edit_scenario.cpp b/src/gui/dialogs/editor/edit_scenario.cpp
@@ -73,9 +73,9 @@ editor_edit_scenario::editor_edit_scenario(
 
 void editor_edit_scenario::pre_show(window& win)
 {
-	win.add_to_tab_order(find_widget<text_box>(&win, "id", false, false));
-	win.add_to_tab_order(find_widget<text_box>(&win, "name", false, false));
-	win.add_to_tab_order(find_widget<text_box>(&win, "description", false, false));
+	win.add_to_tab_order(find_widget<text_box>(&win, "id", false, true));
+	win.add_to_tab_order(find_widget<text_box>(&win, "name", false, true));
+	win.add_to_tab_order(find_widget<text_box>(&win, "description", false, true));
 }
 
 } // namespace dialogs

diff --git a/src/gui/dialogs/editor/edit_side.cpp b/src/gui/dialogs/editor/edit_side.cpp
@@ -88,8 +88,8 @@ void editor_edit_side::pre_show(window& window)
 
 	vision_group.set_member_states(share_vision_);
 
-	window.add_to_tab_order(find_widget<text_box>(&window, "team_name", false, false));
-	window.add_to_tab_order(find_widget<text_box>(&window, "user_team_name", false, false));
+	window.add_to_tab_order(find_widget<text_box>(&window, "team_name", false, true));
+	window.add_to_tab_order(find_widget<text_box>(&window, "user_team_name", false, true));
 }
 
 void editor_edit_side::post_show(window&)

diff --git a/src/gui/dialogs/multiplayer/mp_login.cpp b/src/gui/dialogs/multiplayer/mp_login.cpp
@@ -113,7 +113,7 @@ void mp_login::pre_show(window& win)
 	}
 
 	win.add_to_tab_order(&login);
-	win.add_to_tab_order(find_widget<text_box>(&win, "password", false, false));
+	win.add_to_tab_order(find_widget<text_box>(&win, "password", false, true));
 }
 
 void mp_login::post_show(window& win) {