[Scummvm-git-logs] scummvm master -> efcd857083122a669d9ba54d34a4b7aae07c245b

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
efcd857083 GUI: Fix Mouse Wheel Input for Unknown Game Dialog.


Commit: efcd857083122a669d9ba54d34a4b7aae07c245b
    https://github.com/scummvm/scummvm/commit/efcd857083122a669d9ba54d34a4b7aae07c245b
Author: D G Turner (digitall at scummvm.org)
Date: 2018-10-11T05:52:02+01:00

Commit Message:
GUI: Fix Mouse Wheel Input for Unknown Game Dialog.

This should also fix this for other instances of ScrollContainer, though
the dialogs / widgets may require the same change.

This fixes bug Trac #10741.

Changed paths:
    gui/unknown-game-dialog.cpp
    gui/unknown-game-dialog.h
    gui/widgets/scrollcontainer.cpp
    gui/widgets/scrollcontainer.h


diff --git a/gui/unknown-game-dialog.cpp b/gui/unknown-game-dialog.cpp
index 561d394..ecea160 100644
--- a/gui/unknown-game-dialog.cpp
+++ b/gui/unknown-game-dialog.cpp
@@ -81,6 +81,10 @@ UnknownGameDialog::UnknownGameDialog(const DetectionResults &detectionResults) :
 	rebuild();
 }
 
+void UnknownGameDialog::handleMouseWheel(int x, int y, int direction) {
+	_textContainer->handleMouseWheel(x, y, direction);
+}
+
 void UnknownGameDialog::reflowLayout() {
 	rebuild();
 	Dialog::reflowLayout();
diff --git a/gui/unknown-game-dialog.h b/gui/unknown-game-dialog.h
index bad61d7..c2fc764 100644
--- a/gui/unknown-game-dialog.h
+++ b/gui/unknown-game-dialog.h
@@ -37,6 +37,7 @@ class UnknownGameDialog : public Dialog {
 public:
 	UnknownGameDialog(const DetectionResults &detectionResults);
 
+	void handleMouseWheel(int x, int y, int direction);
 private:
 	void rebuild();
 
diff --git a/gui/widgets/scrollcontainer.cpp b/gui/widgets/scrollcontainer.cpp
index 3c2e7aa..6578d26 100644
--- a/gui/widgets/scrollcontainer.cpp
+++ b/gui/widgets/scrollcontainer.cpp
@@ -49,6 +49,10 @@ void ScrollContainerWidget::init() {
 	recalc();
 }
 
+void ScrollContainerWidget::handleMouseWheel(int x, int y, int direction) {
+	_verticalScroll->handleMouseWheel(x, y, direction);
+}
+
 void ScrollContainerWidget::recalc() {
 	int scrollbarWidth = g_gui.xmlEval()->getVar("Globals.Scrollbar.Width", 0);
 	_limitH = _h;
diff --git a/gui/widgets/scrollcontainer.h b/gui/widgets/scrollcontainer.h
index c4b2f71..49326ac 100644
--- a/gui/widgets/scrollcontainer.h
+++ b/gui/widgets/scrollcontainer.h
@@ -50,6 +50,7 @@ public:
 
 	Common::Rect getClipRect() const override;
 
+	void handleMouseWheel(int x, int y, int direction);
 protected:
 	// We overload getChildY to make sure child widgets are positioned correctly.
 	// Essentially this compensates for the space taken up by the tab title header.