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

[sev-]

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:
dfed81dfff COMMON: MACGUI: Fix MacTextWindow scrolling


Commit: dfed81dfffe28d3c88377fb2412565a0a395bc8e
    https://github.com/scummvm/scummvm/commit/dfed81dfffe28d3c88377fb2412565a0a395bc8e
Author: Avijeet (am388488 at gmail.com)
Date: 2022-06-30T22:43:06+02:00

Commit Message:
COMMON: MACGUI: Fix MacTextWindow scrolling

Changed paths:
    graphics/macgui/mactext.h
    graphics/macgui/mactextwindow.cpp


diff --git a/graphics/macgui/mactext.h b/graphics/macgui/mactext.h
index 0031a619091..dc8b7cd0c96 100644
--- a/graphics/macgui/mactext.h
+++ b/graphics/macgui/mactext.h
@@ -278,6 +278,8 @@ public:
 
 	void setSelRange(int selStart, int selEnd);
 
+	void scroll(int delta);
+
 private:
 	void init();
 	bool isCutAllowed();
@@ -308,8 +310,6 @@ private:
 	void recalcDims();
 	void reallocSurface();
 
-	void scroll(int delta);
-
 	void drawSelection(int xoff, int yoff);
 	void updateCursorPos();
 
diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp
index d7809aae7f7..3cec71271e5 100644
--- a/graphics/macgui/mactextwindow.cpp
+++ b/graphics/macgui/mactextwindow.cpp
@@ -447,6 +447,7 @@ bool MacTextWindow::processEvent(Common::Event &event) {
 		setHighlight(kBorderScrollUp);
 		scroll(-2);
 		calcScrollBar();
+		_mactext->scroll(-2);
 		return true;
 	}
 
@@ -454,6 +455,7 @@ bool MacTextWindow::processEvent(Common::Event &event) {
 		setHighlight(kBorderScrollDown);
 		scroll(2);
 		calcScrollBar();
+		_mactext->scroll(2);
 		return true;
 	}
 
@@ -466,9 +468,11 @@ bool MacTextWindow::processEvent(Common::Event &event) {
 			switch (click) {
 			case kBorderScrollUp:
 				scroll(-1);
+				_mactext->scroll(-1);
 				break;
 			case kBorderScrollDown:
 				scroll(1);
+				_mactext->scroll(1);
 				break;
 			default:
 				return false;