ttext: move maximum_length validity check to member function

wesnoth · Feb 29, 2016 · 91f79a9 · 91f79a9
1 parent ce8ca0a
commit 91f79a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/gui/widgets/text.cpp b/src/gui/widgets/text.cpp
@@ -72,6 +72,10 @@ unsigned ttext_::get_state() const
 
 void ttext_::set_maximum_length(const size_t maximum_length)
 {
+	if(maximum_length == 0) {
+		return;
+	}
+
 	const bool need_update = text_.get_length() > maximum_length;
 
 	text_.set_maximum_length(maximum_length);

diff --git a/src/gui/widgets/text_box.cpp b/src/gui/widgets/text_box.cpp
@@ -125,9 +125,7 @@ void ttext_box::place(const tpoint& origin, const tpoint& size)
 	set_maximum_width(get_text_maximum_width());
 	set_maximum_height(get_text_maximum_height(), false);
 
-	if(max_input_length_ != 0) {
-		set_maximum_length(max_input_length_);
-	}
+	set_maximum_length(max_input_length_);
 
 	update_offsets();
 }
@@ -140,9 +138,7 @@ void ttext_box::update_canvas()
 	const unsigned start = get_selection_start();
 	const int length = get_selection_length();
 
-	if(max_input_length_ != 0) {
-		set_maximum_length(max_input_length_);
-	}
+	set_maximum_length(max_input_length_);
 
 	PangoEllipsizeMode ellipse_mode = PANGO_ELLIPSIZE_NONE;
 	if(!can_wrap()) {