summaryrefslogtreecommitdiff
path: root/src/video.h
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-05 10:21:43 +0100
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-22 20:26:26 +0100
commita06db62288bc3fdbf3f25bcfa046c20510036665 (patch)
tree5ad510ebc223364f8d8f59f84d5bb8081a2822b1 /src/video.h
parent944b99f3a2e87a080666174dc1e2e2b543519904 (diff)
downloadmana-a06db62288bc3fdbf3f25bcfa046c20510036665.tar.gz
mana-a06db62288bc3fdbf3f25bcfa046c20510036665.tar.bz2
mana-a06db62288bc3fdbf3f25bcfa046c20510036665.tar.xz
mana-a06db62288bc3fdbf3f25bcfa046c20510036665.zip
Added support for scaling the output
* Added "Scale" user option, which can either by "Auto" or an explicit scaling factor. Its maximum value depends on the current resolution. The "Auto" factor is based on keeping the logical resolution on at least 800x600, wheres the maximum scale is based on keeping the logical resolution on at least 640x480. * Enabled support for High DPI. This means the rendering target can now have a different resolution than the window size, which can happen on macOS, Windows and Wayland. The resulting scale is multiplied by the above user-controlled scale. Currently, this looks ugly for non-integer scales, which are not used on macOS and can only be configured on some Wayland compositors. Has not been tested on Windows. * Simplified OpenGL initialization (moved out of _beginDraw). * Made sure _beginDraw/_endDraw sets a clip area also for SDLGraphics.
Diffstat (limited to 'src/video.h')
-rw-r--r--src/video.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/video.h b/src/video.h
index df9cd518..c98434e6 100644
--- a/src/video.h
+++ b/src/video.h
@@ -49,15 +49,21 @@ struct VideoSettings
int width = defaultScreenWidth;
int height = defaultScreenHeight;
int display = 0;
+ int userScale = 0;
bool vsync = true;
bool openGL = false;
+ int scale() const;
+ int autoScale() const;
+ int maxScale() const;
+
bool operator==(const VideoSettings &other) const
{
return width == other.width &&
height == other.height &&
windowMode == other.windowMode &&
display == other.display &&
+ userScale == other.userScale &&
vsync == other.vsync &&
openGL == other.openGL;
}
@@ -83,6 +89,11 @@ public:
*/
bool apply(const VideoSettings &settings);
+ /**
+ * Handle a change in window size, possibly adjusting the scale.
+ */
+ void windowSizeChanged(int width, int height);
+
const DisplayMode &desktopDisplayMode() const
{
return mDesktopDisplayMode;