From 5b09c1c8e3dd4ed927e1c6ee670defe83e4382c9 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Thu, 27 Dec 2012 10:37:02 +0100
Subject: GUI: Don't allow changing disabled popup widgets with mouse wheel

This was another inconsistency between changing the widget by
clicking and changing it with the mouse wheel. Hopefully the last
one, though.
---
 gui/widgets/popup.cpp | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/gui/widgets/popup.cpp b/gui/widgets/popup.cpp
index 61d4a54c3f..829a49c53e 100644
--- a/gui/widgets/popup.cpp
+++ b/gui/widgets/popup.cpp
@@ -394,20 +394,22 @@ void PopUpWidget::handleMouseDown(int x, int y, int button, int clickCount) {
 }
 
 void PopUpWidget::handleMouseWheel(int x, int y, int direction) {
-	int newSelection = _selectedItem + direction;
+	if (isEnabled()) {
+		int newSelection = _selectedItem + direction;
 
-	// Skip separator entries
-	while ((newSelection >= 0) && (newSelection < (int)_entries.size()) &&
-		_entries[newSelection].name.equals("")) {
-		newSelection += direction;
-	}
+		// Skip separator entries
+		while ((newSelection >= 0) && (newSelection < (int)_entries.size()) &&
+			_entries[newSelection].name.equals("")) {
+			newSelection += direction;
+		}
 
-	// Just update the selected item when we're in range
-	if ((newSelection >= 0) && (newSelection < (int)_entries.size()) &&
-		(newSelection != _selectedItem)) {
-		_selectedItem = newSelection;
-		sendCommand(kPopUpItemSelectedCmd, _entries[_selectedItem].tag);
-		draw();
+		// Just update the selected item when we're in range
+		if ((newSelection >= 0) && (newSelection < (int)_entries.size()) &&
+			(newSelection != _selectedItem)) {
+			_selectedItem = newSelection;
+			sendCommand(kPopUpItemSelectedCmd, _entries[_selectedItem].tag);
+			draw();
+		}
 	}
 }
 
-- 
cgit v1.2.3