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

[sev-]

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

Summary:
b2851f8128 GRAPHICS: MACGUI: add _draggable property to BaseMacWindow
c2bee8fc1d DIRECTOR: set _draggable to false if window is Stage


Commit: b2851f812835e4f01a6a78f7b800af2e0fb445b3
    https://github.com/scummvm/scummvm/commit/b2851f812835e4f01a6a78f7b800af2e0fb445b3
Author: s-m33r (112017240+s-m33r at users.noreply.github.com)
Date: 2024-03-25T21:22:56+01:00

Commit Message:
GRAPHICS: MACGUI: add _draggable property to BaseMacWindow

Changed paths:
    graphics/macgui/macwindow.cpp
    graphics/macgui/macwindow.h


diff --git a/graphics/macgui/macwindow.cpp b/graphics/macgui/macwindow.cpp
index 570abcaf0b2..e811ade9594 100644
--- a/graphics/macgui/macwindow.cpp
+++ b/graphics/macgui/macwindow.cpp
@@ -40,6 +40,8 @@ BaseMacWindow::BaseMacWindow(int id, bool editable, MacWindowManager *wm) :
 	_type = kWindowUnknown;
 
 	_visible = true;
+
+	_draggable = true;
 }
 
 void BaseMacWindow::setVisible(bool visible, bool silent) { _visible = visible; _wm->setFullRefresh(true); }
@@ -480,7 +482,7 @@ bool MacWindow::processEvent(Common::Event &event) {
 			_wm->_hoveredWidget = nullptr;
 		}
 
-		if (_beingDragged) {
+		if (_beingDragged && _draggable) {
 			_dims.translate(event.mouse.x - _draggedX, event.mouse.y - _draggedY);
 			updateInnerDims();
 
diff --git a/graphics/macgui/macwindow.h b/graphics/macgui/macwindow.h
index 3049adb401f..d81601778ee 100644
--- a/graphics/macgui/macwindow.h
+++ b/graphics/macgui/macwindow.h
@@ -181,6 +181,8 @@ protected:
 	void *_dataPtr;
 
 	bool _visible;
+
+	bool _draggable;
 };
 
 /**


Commit: c2bee8fc1d4cf9e29cf5e89a90e3e5a01036f134
    https://github.com/scummvm/scummvm/commit/c2bee8fc1d4cf9e29cf5e89a90e3e5a01036f134
Author: s-m33r (112017240+s-m33r at users.noreply.github.com)
Date: 2024-03-25T21:22:56+01:00

Commit Message:
DIRECTOR: set _draggable to false if window is Stage

Changed paths:
    engines/director/window.cpp


diff --git a/engines/director/window.cpp b/engines/director/window.cpp
index 3083454ce4c..a21e27207b9 100644
--- a/engines/director/window.cpp
+++ b/engines/director/window.cpp
@@ -62,6 +62,8 @@ Window::Window(int id, bool scrollable, bool resizable, bool editable, Graphics:
 	_isModal = false;
 
 	updateBorderType();
+
+	_draggable = !_isStage;
 }
 
 Window::~Window() {