forked from AuroraMiddleware/gtk
win32: move function
Just reorder code in preparation to calling functions defined before this one
This commit is contained in:
parent
00f396dea9
commit
b20f80e65a
@ -256,45 +256,6 @@ init_visual (GdkScreen *screen,
|
||||
return visual;
|
||||
}
|
||||
|
||||
static void
|
||||
gdk_win32_screen_init (GdkWin32Screen *win32_screen)
|
||||
{
|
||||
GdkScreen *screen = GDK_SCREEN (win32_screen);
|
||||
HDC screen_dc;
|
||||
int logpixelsx = -1;
|
||||
const gchar *font_resolution;
|
||||
|
||||
screen_dc = GetDC (NULL);
|
||||
|
||||
if (screen_dc)
|
||||
{
|
||||
logpixelsx = GetDeviceCaps(screen_dc, LOGPIXELSX);
|
||||
ReleaseDC (NULL, screen_dc);
|
||||
}
|
||||
|
||||
font_resolution = g_getenv ("GDK_WIN32_FONT_RESOLUTION");
|
||||
if (font_resolution)
|
||||
{
|
||||
int env_logpixelsx = atol (font_resolution);
|
||||
if (env_logpixelsx > 0)
|
||||
logpixelsx = env_logpixelsx;
|
||||
}
|
||||
|
||||
if (logpixelsx > 0)
|
||||
_gdk_screen_set_resolution (screen, logpixelsx);
|
||||
|
||||
win32_screen->system_visual = init_visual (screen, FALSE);
|
||||
win32_screen->rgba_visual = init_visual (screen, TRUE);
|
||||
|
||||
win32_screen->available_visual_depths[0] = win32_screen->rgba_visual->depth;
|
||||
win32_screen->available_visual_types[0] = win32_screen->rgba_visual->type;
|
||||
|
||||
_gdk_screen_init_monitors (win32_screen);
|
||||
|
||||
/* On Windows 8 and later, DWM (composition) is always enabled */
|
||||
win32_screen->always_composited = g_win32_check_windows_version (6, 2, 0, G_WIN32_OS_ANY);
|
||||
}
|
||||
|
||||
void
|
||||
_gdk_screen_init_root_window_size (GdkWin32Screen *screen)
|
||||
{
|
||||
@ -467,6 +428,45 @@ _gdk_screen_init_monitors (GdkWin32Screen *screen)
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
gdk_win32_screen_init (GdkWin32Screen *win32_screen)
|
||||
{
|
||||
GdkScreen *screen = GDK_SCREEN (win32_screen);
|
||||
HDC screen_dc;
|
||||
int logpixelsx = -1;
|
||||
const gchar *font_resolution;
|
||||
|
||||
screen_dc = GetDC (NULL);
|
||||
|
||||
if (screen_dc)
|
||||
{
|
||||
logpixelsx = GetDeviceCaps(screen_dc, LOGPIXELSX);
|
||||
ReleaseDC (NULL, screen_dc);
|
||||
}
|
||||
|
||||
font_resolution = g_getenv ("GDK_WIN32_FONT_RESOLUTION");
|
||||
if (font_resolution)
|
||||
{
|
||||
int env_logpixelsx = atol (font_resolution);
|
||||
if (env_logpixelsx > 0)
|
||||
logpixelsx = env_logpixelsx;
|
||||
}
|
||||
|
||||
if (logpixelsx > 0)
|
||||
_gdk_screen_set_resolution (screen, logpixelsx);
|
||||
|
||||
win32_screen->system_visual = init_visual (screen, FALSE);
|
||||
win32_screen->rgba_visual = init_visual (screen, TRUE);
|
||||
|
||||
win32_screen->available_visual_depths[0] = win32_screen->rgba_visual->depth;
|
||||
win32_screen->available_visual_types[0] = win32_screen->rgba_visual->type;
|
||||
|
||||
_gdk_screen_init_monitors (win32_screen);
|
||||
|
||||
/* On Windows 8 and later, DWM (composition) is always enabled */
|
||||
win32_screen->always_composited = g_win32_check_windows_version (6, 2, 0, G_WIN32_OS_ANY);
|
||||
}
|
||||
|
||||
static GdkDisplay *
|
||||
gdk_win32_screen_get_display (GdkScreen *screen)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user