[Scummvm-git-logs] scummvm master -> 050067294f5fd34b0dae39edaa647d0cbd93e364

[sev-]

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

Summary:
050067294f MACGUI: Avoid needless copies of BorderOffsets


Commit: 050067294f5fd34b0dae39edaa647d0cbd93e364
    https://github.com/scummvm/scummvm/commit/050067294f5fd34b0dae39edaa647d0cbd93e364
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2025-08-17T00:25:43+02:00

Commit Message:
MACGUI: Avoid needless copies of BorderOffsets

Changed paths:
    graphics/macgui/datafiles.cpp
    graphics/macgui/macwindow.cpp
    graphics/macgui/macwindow.h
    graphics/macgui/macwindowborder.cpp
    graphics/macgui/macwindowborder.h
    graphics/macgui/macwindowmanager.h


diff --git a/graphics/macgui/datafiles.cpp b/graphics/macgui/datafiles.cpp
index a55472c6a99..0840c0e706f 100644
--- a/graphics/macgui/datafiles.cpp
+++ b/graphics/macgui/datafiles.cpp
@@ -88,7 +88,7 @@ void MacWindowManager::cleanupDataBundle() {
 	delete _dataBundle;
 }
 
-BorderOffsets MacWindowManager::getBorderOffsets(uint32 windowType) {
+const BorderOffsets &MacWindowManager::getBorderOffsets(uint32 windowType) {
 	int i = 0;
 	while (borders[i].type != 0xFF) {
 		if (borders[i].type == windowType)
diff --git a/graphics/macgui/macwindow.cpp b/graphics/macgui/macwindow.cpp
index 2aae9b43ee6..fc9f1a67e8f 100644
--- a/graphics/macgui/macwindow.cpp
+++ b/graphics/macgui/macwindow.cpp
@@ -394,11 +394,11 @@ void MacWindow::loadBorder(Common::SeekableReadStream &file, uint32 flags, int l
 	_macBorder.loadBorder(file, flags, lo, ro, to, bo);
 }
 
-void MacWindow::loadBorder(Common::SeekableReadStream &file, uint32 flags, BorderOffsets offsets) {
+void MacWindow::loadBorder(Common::SeekableReadStream &file, uint32 flags, const BorderOffsets &offsets) {
 	_macBorder.loadBorder(file, flags, offsets);
 }
 
-void MacWindow::setBorder(Graphics::ManagedSurface *surface, uint32 flags, BorderOffsets offsets) {
+void MacWindow::setBorder(Graphics::ManagedSurface *surface, uint32 flags, const BorderOffsets &offsets) {
 	_macBorder.setBorder(surface, flags, offsets);
 }
 
diff --git a/graphics/macgui/macwindow.h b/graphics/macgui/macwindow.h
index 36d15f1b078..859880678b6 100644
--- a/graphics/macgui/macwindow.h
+++ b/graphics/macgui/macwindow.h
@@ -338,8 +338,8 @@ public:
 	 * @param bo Width of the bottom side of the border, in pixels.
 	 */
 	void loadBorder(Common::SeekableReadStream &file, uint32 flags, int lo = -1, int ro = -1, int to = -1, int bo = -1);
-	void loadBorder(Common::SeekableReadStream &file, uint32 flags, BorderOffsets offsets);
-	void setBorder(Graphics::ManagedSurface *surface, uint32 flags, BorderOffsets offsets);
+	void loadBorder(Common::SeekableReadStream &file, uint32 flags, const BorderOffsets &offsets);
+	void setBorder(Graphics::ManagedSurface *surface, uint32 flags, const BorderOffsets &offsets);
 	void disableBorder();
 	void loadInternalBorder(uint32 flags);
 	/**
@@ -402,7 +402,7 @@ private:
 protected:
 	void drawBorder();
 	WindowClick isInBorder(int x, int y) const;
-	BorderOffsets getBorderOffsets() const { return _macBorder.getOffset(); }
+	const BorderOffsets &getBorderOffsets() const { return _macBorder.getOffset(); }
 
 protected:
 	ManagedSurface _borderSurface;
diff --git a/graphics/macgui/macwindowborder.cpp b/graphics/macgui/macwindowborder.cpp
index 2dcb56e1662..7dfe226cdb7 100644
--- a/graphics/macgui/macwindowborder.cpp
+++ b/graphics/macgui/macwindowborder.cpp
@@ -243,7 +243,7 @@ void MacWindowBorder::loadBorder(Common::SeekableReadStream &file, uint32 flags,
 	loadBorder(file, flags, offsets);
 }
 
-void MacWindowBorder::loadBorder(Common::SeekableReadStream &file, uint32 flags, BorderOffsets offsets) {
+void MacWindowBorder::loadBorder(Common::SeekableReadStream &file, uint32 flags, const BorderOffsets &offsets) {
 	Image::BitmapDecoder bmpDecoder;
 	bmpDecoder.loadStream(file);
 
@@ -286,7 +286,7 @@ void MacWindowBorder::setBorder(Graphics::ManagedSurface *surface, uint32 flags,
 	setBorder(surface, flags, offsets);
 }
 
-void MacWindowBorder::setBorder(Graphics::ManagedSurface *surface, uint32 flags, BorderOffsets offsets) {
+void MacWindowBorder::setBorder(Graphics::ManagedSurface *surface, uint32 flags, const BorderOffsets &offsets) {
 	addBorder(surface, flags, offsets.titlePos);
 
 	if ((flags & kWindowBorderActive) && offsets.left + offsets.right + offsets.top + offsets.bottom > -4) { // Checking against default -1
@@ -306,7 +306,7 @@ void MacWindowBorder::loadInternalBorder(uint32 flags) {
 		warning("trying to load non-existing internal border type");
 		return;
 	}
-	BorderOffsets offsets = _wm->getBorderOffsets(_borderType);
+	const BorderOffsets &offsets = _wm->getBorderOffsets(_borderType);
 	Common::SeekableReadStream *file = _wm->getBorderFile(_borderType, flags);
 	if (file) {
 		loadBorder(*file, flags, offsets);
diff --git a/graphics/macgui/macwindowborder.h b/graphics/macgui/macwindowborder.h
index 4bef45e31f7..587e96e15d7 100644
--- a/graphics/macgui/macwindowborder.h
+++ b/graphics/macgui/macwindowborder.h
@@ -159,11 +159,11 @@ public:
 	void disableBorder();
 
 	void loadBorder(Common::SeekableReadStream &file, uint32 flags, int lo = -1, int ro = -1, int to = -1, int bo = -1);
-	void loadBorder(Common::SeekableReadStream &file, uint32 flags, BorderOffsets offsets);
+	void loadBorder(Common::SeekableReadStream &file, uint32 flags, const BorderOffsets &offsets);
 	void loadInternalBorder(uint32 flags);
 
 	void setBorder(Graphics::ManagedSurface *surface, uint32 flags, int lo = -1, int ro = -1, int to = -1, int bo = -1);
-	void setBorder(Graphics::ManagedSurface *surface, uint32 flags, BorderOffsets offsets);
+	void setBorder(Graphics::ManagedSurface *surface, uint32 flags, const BorderOffsets &offsets);
 private:
 	int _scrollPos, _scrollSize;
 	Common::String _title;
diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index f272f235510..87ae6a563d7 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -363,7 +363,7 @@ public:
 	void cleanupDataBundle();
 	void cleanupDesktopBmp();
 
-	BorderOffsets getBorderOffsets(uint32 windowType);
+	const BorderOffsets &getBorderOffsets(uint32 windowType);
 	Common::SeekableReadStream *getBorderFile(uint32 windowType, uint32 flags);
 	Common::SeekableReadStream *getFile(const Common::Path &filename);