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

[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:
ed923ba26d BASE: Add commented out dumping of all GUI dialogs
ac388673e9 GRAPHICS: MACGUI: Fix table width computation in MacText


Commit: ed923ba26d5666970bc7987b5d593c14aaef6e05
    https://github.com/scummvm/scummvm/commit/ed923ba26d5666970bc7987b5d593c14aaef6e05
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-10-10T23:23:35+02:00

Commit Message:
BASE: Add commented out dumping of all GUI dialogs

Changed paths:
    base/main.cpp


diff --git a/base/main.cpp b/base/main.cpp
index c7aca3ee4c8..67ad8c4facc 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -96,6 +96,8 @@
 #include "backends/fs/android/android-fs-factory.h"
 #endif
 
+#include "gui/dump-all-dialogs.h"
+
 static bool launcherDialog() {
 
 	// Discard any command line options. Those that affect the graphics
@@ -655,7 +657,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 				"\n"
 				"  1. From the Launcher, go to **Game Options > Paths**."
 				" Select **Game Path** or **Extra Path**, as appropriate. \n"
-				"  2. Inside the ScummVM file browser, select **Go Up** until you reach the root folder" 
+				"  2. Inside the ScummVM file browser, select **Go Up** until you reach the root folder"
 				"which has the **<Add a new folder>** option.\n"
 				"  3. Double-tap **<Add a new folder>**. In your device's file browser, navigate to the folder"
 				"containing all your game folders. For example, **SD Card > ScummVMgames** \n"
@@ -680,7 +682,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 				"To add a game:\n"
 				"\n"
 				"  1. Select **Add Game...** from the launcher. \n"
-				"  2. Inside the ScummVM file browser, select **Go Up** until you reach the root folder" 
+				"  2. Inside the ScummVM file browser, select **Go Up** until you reach the root folder"
 				"which has the **<Add a new folder>** option.\n"
 				"  3. Double-tap **<Add a new folder>**. In your device's file browser, navigate to the folder"
 				"containing all your game folders. For example, **SD Card > ScummVMgames** \n"
@@ -708,6 +710,10 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 	CloudMan.syncSaves();
 #endif
 
+#if 0
+	GUI::dumpAllDialogs();
+#endif
+
 	// Unless a game was specified, show the launcher dialog
 	if (nullptr == ConfMan.getActiveDomain())
 		launcherDialog();


Commit: ac388673e96b01feda61617d663b48d5ba20c73e
    https://github.com/scummvm/scummvm/commit/ac388673e96b01feda61617d663b48d5ba20c73e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-10-10T23:23:39+02:00

Commit Message:
GRAPHICS: MACGUI: Fix table width computation in MacText

Changed paths:
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 44c91288a8b..5aab73eabcf 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -3020,6 +3020,7 @@ void MacText::processTable(int line) {
 	ManagedSurface *surf = new ManagedSurface(tW, tH, _wm->_pixelformat);
 	_canvas._text[line].tableSurface = surf;
 	_canvas._text[line].height = tH;
+	_canvas._text[line].width = tW;
 	surf->clear(_bgcolor);
 
 	surf->hLine(0, 0, tW, _fgcolor);
@@ -3034,7 +3035,7 @@ void MacText::processTable(int line) {
 
 	int x = 1;
 	for (uint i = 0; i < table->front().cells.size(); i++) {
-		x += gutter * 2 + rowH[i];
+		x += gutter * 2 + colW[i];
 		surf->vLine(x, 0, tH, _fgcolor);
 		x++;
 	}