From 025af47181aaf92dede5f66cbf89554fe38a4541 Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Sat, 16 Jun 2018 15:03:45 +1100
Subject: [PATCH] GUI2/Multimenu Button: store max shown count as an unsigned
 int

A negative count here makes no sense...

(cherry-picked from commit 23740ea3cfd625a6e4c0ab2575db0d1c6f247ff4)
---
 src/gui/widgets/multimenu_button.cpp | 4 ++--
 src/gui/widgets/multimenu_button.hpp | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gui/widgets/multimenu_button.cpp b/src/gui/widgets/multimenu_button.cpp
index 3a4ec31dd72..c31c87ea466 100644
--- a/src/gui/widgets/multimenu_button.cpp
+++ b/src/gui/widgets/multimenu_button.cpp
@@ -166,8 +166,8 @@ void multimenu_button::update_label()
 	if(selected.size() == values_.size()) {
 		set_label(_("multimenu^All Selected"));
 	} else {
-		if(selected.size() > static_cast<std::size_t>(max_shown_)) {
-			const int excess = selected.size() - max_shown_;
+		if(selected.size() > max_shown_) {
+			const unsigned excess = selected.size() - max_shown_;
 			selected.resize(max_shown_ + 1);
 			selected.back() = VNGETTEXT("multimenu^$excess other", "$excess others", excess, {{"excess", std::to_string(excess)}});
 		}
diff --git a/src/gui/widgets/multimenu_button.hpp b/src/gui/widgets/multimenu_button.hpp
index 241f8d3aa5c..5cf08abf14f 100644
--- a/src/gui/widgets/multimenu_button.hpp
+++ b/src/gui/widgets/multimenu_button.hpp
@@ -62,7 +62,7 @@ public:
 	 *
 	 * @param max      The maximum number of elements to show
 	 */
-	void set_max_shown(const int max)
+	void set_max_shown(const unsigned max)
 	{
 		max_shown_ = max;
 	}
@@ -72,7 +72,7 @@ public:
 	 *
 	 * @returns        The maximum number of elements to show
 	 */
-	int get_max_shown()
+	unsigned get_max_shown()
 	{
 		return max_shown_;
 	}
@@ -150,7 +150,7 @@ private:
 	/**
 	 * The maximum number of selected states to list in the label
 	 */
-	int max_shown_;
+	unsigned max_shown_;
 
 	std::vector<::config> values_;
 
@@ -213,7 +213,7 @@ public:
 	widget* build() const;
 
 private:
-	int max_shown_;
+	unsigned max_shown_;
 	std::vector<::config> options_;
 };