cpp/openttd-patchpack/source Changeset - r26056:63fb51e65511

Changeset - r26056:63fb51e65511

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

Tyler Trahan - 3 years ago 2021-11-07 16:41:24
tyler@tylertrahan.com

Fix: Don't show screenshot GUI in screenshots (#9674)

3 files changed with 26 insertions and 0 deletions:

src/screenshot.cpp

src/screenshot_gui.cpp

src/screenshot_gui.h

0 comments (0 inline, 0 general)

src/screenshot.cpp

➞

Show inline comments

@@ @@ -12,6 +12,7 @@ @@
 #include "viewport_func.h"
 #include "gfx_func.h"
 #include "screenshot.h"
 #include "screenshot_gui.h"
 #include "blitter/factory.hpp"
 #include "zoom_func.h"
 #include "core/endian_func.hpp"
@@ @@ -909,8 +910,10 @@ static bool RealMakeScreenshot(Screensho @@
 		 * of the screenshot. This way the screenshot will always show the name
 		 * of the previous screenshot in the 'successful' message instead of the
 		 * name of the new screenshot (or an empty name). */
 		SetScreenshotWindowVisibility(true);
 		UndrawMouseCursor();
 		DrawDirtyBlocks();
 		SetScreenshotWindowVisibility(false);
+	}
 	_screenshot_name[0] = '\0';

src/screenshot_gui.cpp

➞

Show inline comments

@@ @@ -13,6 +13,7 @@ @@
 #include "screenshot.h"
 #include "widgets/screenshot_widget.h"
 #include "table/strings.h"
 #include "gfx_func.h"
 struct ScreenshotWindow : Window {
 	ScreenshotWindow(WindowDesc *desc) : Window(desc)
@@ @@ -72,3 +73,24 @@ void ShowScreenshotWindow() @@
 	CloseWindowById(WC_SCREENSHOT, 0);
 	new ScreenshotWindow(&_screenshot_window_desc);
+}
 /**
  * Set the visibility of the screenshot window when taking a screenshot.
  * @param hide Are we hiding the window or showing it again after the screenshot is taken?
  */
 void SetScreenshotWindowVisibility(bool hide)
+{
 	ScreenshotWindow *scw = (ScreenshotWindow *)FindWindowById(WC_SCREENSHOT, 0);
 	if (scw == nullptr) return;
 	if (hide) {
 		/* Set dirty the screen area where the window is covering (not the window itself), then move window off screen. */
 		scw->SetDirty();
 		scw->left += 2 * _screen.width;
 	} else {
 		/* Return window to original position. */
 		scw->left -= 2 * _screen.width;
 		scw->SetDirty();
+	}
+}

src/screenshot_gui.h

➞

Show inline comments

@@ @@ -11,5 +11,6 @@ @@
 #define SCREENSHOT_GUI_H
 void ShowScreenshotWindow();
 void SetScreenshotWindowVisibility(bool hide);
 #endif /* SCREENSHOT_GUI_H */

0 comments (0 inline, 0 general)