Merge lp:~notabilis27/widelands/bug-mousewheel into lp:widelands

[Notabilis]

[kaputtnik (franku)]

Great :)

review: Approve (testing)

[SirVer (sirver)]

Awesome! THanks for taking care of this issue. I didn't test, but found a few nits in the code. Could you consider them pleaes?

review: Needs Fixing

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1181. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/143769774.
Appveyor build 1019. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_notabilis27_widelands_bug_mousewheel-1019.

[Notabilis (notabilis27)]

Okay, is changed. And it really does look better.
Also did a short test after modifying the code, seems like I haven't introduced new mistakes.

[SirVer (sirver)]

Cool, I think the code reads quite clear now. Let's get that in!

@bunnybot merge

review: Approve

=== modified file 'src/ui_basic/panel.cc'
--- src/ui_basic/panel.cc	2016-03-10 15:00:32 +0000
+++ src/ui_basic/panel.cc	2016-07-11 17:00:11 +0000
@@ -857,14 +857,27 @@
 }
 
 
-bool Panel::do_mousewheel(uint32_t which, int32_t x, int32_t y) {
-	// TODO(GunChleoc): This is just a hack for focussed panels
-	// We need to find the actualy scrollable panel beneaththe mouse cursor,
-	// so we can have multiple scrollable elements on the same screen
-	// e.g. load map with a long desctiprion has 2 of them.
-	if (focus_) {
-		if (focus_->do_mousewheel(which, x, y))
+bool Panel::do_mousewheel(uint32_t which, int32_t x, int32_t y, Point rel_mouse_pos) {
+
+	// Check if a child-panel is beneath the mouse and processes the event
+	for (Panel * child = first_child_; child; child = child->next_) {
+		if (!child->handles_mouse() || !child->is_visible()) {
+			continue;
+		}
+		if (rel_mouse_pos.x >= child->x_ + static_cast<int32_t>(child->w_)
+			|| rel_mouse_pos.x < child->x_
+			|| rel_mouse_pos.y >= child->y_ + static_cast<int32_t>(child->h_)
+			|| rel_mouse_pos.y < child->y_) {
+			continue;
+		}
+		// Found a child at the position
+		if (child->do_mousewheel(which, x, y, rel_mouse_pos
+				- Point(child->get_x() + child->get_lborder(), child->get_y() + child->get_tborder()))) {
 			return true;
+		}
+		// Break after the first hit panel in the list. The panels are ordered from top to bottom,
+		// so only the highest window at the current mouse coordinates receives the event
+		break;
 	}
 
 	return handle_mousewheel(which, x, y);
@@ -1065,7 +1078,7 @@
 	if (!p) {
 		return false;
 	}
-	return p->do_mousewheel(which, x, y);
+	return p->do_mousewheel(which, x, y, p->get_mouse_position());
 }
 
 

=== modified file 'src/ui_basic/panel.h'
--- src/ui_basic/panel.h	2016-02-18 18:27:52 +0000
+++ src/ui_basic/panel.h	2016-07-11 17:00:11 +0000
@@ -288,7 +288,7 @@
 	bool do_mouserelease(const uint8_t btn, int32_t x, int32_t y);
 	bool do_mousemove
 		(const uint8_t state, int32_t x, int32_t y, int32_t xdiff, int32_t ydiff);
-	bool do_mousewheel(uint32_t which, int32_t x, int32_t y);
+	bool do_mousewheel(uint32_t which, int32_t x, int32_t y, Point rel_mouse_pos);
 	bool do_key(bool down, SDL_Keysym code);
 	bool do_textinput(const std::string& text);
 	bool do_tooltip();