Merge lp:~qcumber-some/widelands/alocritani-896879-change_button_enable_logic into lp:widelands

[Jens Beyer]

On behalf of alocritani (see bug comments).

[Tino (tino79)]

review: Approve

[Nicolai Hähnle (nha)]

Approve.

Side note: I'm not a huge fan of the type of alignment that is done in the hunk at line 172. Yes, the original code does it that way, so this is not a comment against the patch. I just don't think it's good practice, because it makes code maintenance more painful.

review: Approve

=== modified file 'src/ui_basic/spinbox.cc'
--- src/ui_basic/spinbox.cc	2011-11-23 17:05:46 +0000
+++ src/ui_basic/spinbox.cc	2011-11-27 21:31:29 +0000
@@ -172,8 +172,8 @@
 	sbi->butMinus->set_enabled(sbi->min < sbi->value);
 	sbi->butPlus ->set_enabled           (sbi->value < sbi->max);
 	if (m_big) {
-		sbi->butTenMinus->set_enabled(sbi->min + 10 < sbi->value);
-		sbi->butTenPlus->set_enabled(sbi->value < sbi->max - 10);
+		sbi->butTenMinus->set_enabled(sbi->min < sbi->value);
+		sbi->butTenPlus ->set_enabled           (sbi->value < sbi->max);
 	}
 }
 
@@ -193,6 +193,10 @@
 void SpinBox::setValue(int32_t const value)
 {
 	sbi->value = value;
+	if (sbi->value > sbi->max)
+		sbi->value = sbi->max;
+	else if (sbi->value < sbi->min)
+		sbi->value = sbi->min;
 	update();
 }