Merge pull request #12801 from unknownbrackets/ui-display

Windows: Prevent applying -1 as inset space
hrydgard · Apr 6, 2020 · 2405157 · 2405157
2 parents 268df5a + fd0bf21
commit 2405157
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp
@@ -174,6 +174,11 @@ float System_GetPropertyFloat(SystemProperty prop) {
 		return QApplication::primaryScreen()->logicalDotsPerInch();
 	case SYSPROP_DISPLAY_DPI:
 		return QApplication::primaryScreen()->physicalDotsPerInch();
+	case SYSPROP_DISPLAY_SAFE_INSET_LEFT:
+	case SYSPROP_DISPLAY_SAFE_INSET_RIGHT:
+	case SYSPROP_DISPLAY_SAFE_INSET_TOP:
+	case SYSPROP_DISPLAY_SAFE_INSET_BOTTOM:
+		return 0.0f;
 	default:
 		return -1;
 	}

diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
@@ -337,6 +337,11 @@ float System_GetPropertyFloat(SystemProperty prop) {
 	switch (prop) {
 	case SYSPROP_DISPLAY_REFRESH_RATE:
 		return g_RefreshRate;
+	case SYSPROP_DISPLAY_SAFE_INSET_LEFT:
+	case SYSPROP_DISPLAY_SAFE_INSET_RIGHT:
+	case SYSPROP_DISPLAY_SAFE_INSET_TOP:
+	case SYSPROP_DISPLAY_SAFE_INSET_BOTTOM:
+		return 0.0f;
 	default:
 		return -1;
 	}

diff --git a/Windows/main.cpp b/Windows/main.cpp
@@ -248,6 +248,11 @@ float System_GetPropertyFloat(SystemProperty prop) {
 		return 60.f;
 	case SYSPROP_DISPLAY_DPI:
 		return (float)ScreenDPI();
+	case SYSPROP_DISPLAY_SAFE_INSET_LEFT:
+	case SYSPROP_DISPLAY_SAFE_INSET_RIGHT:
+	case SYSPROP_DISPLAY_SAFE_INSET_TOP:
+	case SYSPROP_DISPLAY_SAFE_INSET_BOTTOM:
+		return 0.0f;
 	default:
 		return -1;
 	}