Skip to content

Windows: Improve DPI scaling on modern OS versions #19387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ryunam wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −6
Open

Windows: Improve DPI scaling on modern OS versions #19387

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions gfx/display_servers/dispserv_win32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ typedef struct DISPLAYCONFIG_PATH_INFO_CUSTOM

typedef LONG (WINAPI *QUERYDISPLAYCONFIG)(UINT32, UINT32*, DISPLAYCONFIG_PATH_INFO_CUSTOM*, UINT32*, DISPLAYCONFIG_MODE_INFO_CUSTOM*, UINT32*);
typedef LONG (WINAPI *GETDISPLAYCONFIGBUFFERSIZES)(UINT32, UINT32*, UINT32*);
typedef HRESULT (WINAPI *GETSCALEFACTOR)(HMONITOR, int*);

static void *win32_display_server_init(void)
{
Expand Down Expand Up @@ -897,13 +898,34 @@ static bool win32_display_server_get_metrics(void *data,
*value = (float)GetDeviceCaps(monitor, VERTSIZE);
break;
case DISPLAY_METRIC_DPI:
/* 25.4 mm in an inch. */
{
int pixels_x = GetDeviceCaps(monitor, HORZRES);
int physical_width = GetDeviceCaps(monitor, HORZSIZE);
*value = (physical_width > 0)
? (float)(254 * pixels_x) / (float)(physical_width * 10)
: 0.0f;
static float dpi;

if (dpi == 0.0f)
{
HMODULE shcore = LoadLibraryA("shcore.dll");
GETSCALEFACTOR get_scale_factor = NULL;
int scale;

if (shcore)
get_scale_factor = (GETSCALEFACTOR)GetProcAddress(
shcore, "GetScaleFactorForMonitor");

if ( get_scale_factor
&& get_scale_factor(MonitorFromWindow(
win32_get_window(), MONITOR_DEFAULTTONEAREST), &scale) == S_OK)
dpi = 96.0f * scale / 100.0f;
else
{
/* 25.4 mm in an inch. */
int pixels_x = GetDeviceCaps(monitor, HORZRES);
int physical_width = GetDeviceCaps(monitor, HORZSIZE);
dpi = (physical_width > 0)
? (float)(254 * pixels_x) / (float)(physical_width * 10)
: 0.0f;
}
}
*value = dpi;
}
break;
default:
Expand Down
Loading