|
@@ -68,6 +68,7 @@ main(int argc, char* argv[])
|
|
struct nk_context *ctx;
|
|
struct nk_context *ctx;
|
|
|
|
|
|
/* SDL setup */
|
|
/* SDL setup */
|
|
|
|
+ SDL_SetHint(SDL_HINT_VIDEO_HIGHDPI_DISABLED, "0");
|
|
SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_EVENTS);
|
|
SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_EVENTS);
|
|
SDL_GL_SetAttribute (SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG);
|
|
SDL_GL_SetAttribute (SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG);
|
|
SDL_GL_SetAttribute (SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
|
|
SDL_GL_SetAttribute (SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
|
|
@@ -76,7 +77,7 @@ main(int argc, char* argv[])
|
|
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
|
|
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
|
|
win = SDL_CreateWindow("Demo",
|
|
win = SDL_CreateWindow("Demo",
|
|
SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
|
|
SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
|
|
- WINDOW_WIDTH, WINDOW_HEIGHT, SDL_WINDOW_OPENGL|SDL_WINDOW_SHOWN);
|
|
|
|
|
|
+ WINDOW_WIDTH, WINDOW_HEIGHT, SDL_WINDOW_OPENGL|SDL_WINDOW_SHOWN|SDL_WINDOW_ALLOW_HIGHDPI);
|
|
glContext = SDL_GL_CreateContext(win);
|
|
glContext = SDL_GL_CreateContext(win);
|
|
SDL_GetWindowSize(win, &win_width, &win_height);
|
|
SDL_GetWindowSize(win, &win_width, &win_height);
|
|
|
|
|
|
@@ -121,7 +122,7 @@ main(int argc, char* argv[])
|
|
|
|
|
|
/* GUI */
|
|
/* GUI */
|
|
{struct nk_panel layout;
|
|
{struct nk_panel layout;
|
|
- if (nk_begin(ctx, &layout, "Demo", nk_rect(50, 50, 210, 250),
|
|
|
|
|
|
+ if (nk_begin(ctx, &layout, "Demo", nk_rect(200, 200, 210, 250),
|
|
NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_SCALABLE|
|
|
NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_SCALABLE|
|
|
NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE))
|
|
NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE))
|
|
{
|
|
{
|