Mercurial > hg > orthanc-stone
diff Samples/Sdl/FusionMprSdl.cpp @ 897:9c2f6d6b9f4a am-dev
Merge
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Tue, 16 Jul 2019 12:37:29 +0200 |
parents | 6e79e8c9021c 0aff28f15ea2 |
children | f9ae731fdc25 |
line wrap: on
line diff
--- a/Samples/Sdl/FusionMprSdl.cpp Fri Jul 12 14:57:48 2019 +0200 +++ b/Samples/Sdl/FusionMprSdl.cpp Tue Jul 16 12:37:29 2019 +0200 @@ -20,7 +20,7 @@ #include "FusionMprSdl.h" -#include "../../Applications/Sdl/SdlOpenGLWindow.h" +#include "../../Applications/Sdl/SdlOpenGLContext.h" #include "../../Framework/StoneInitialization.h" @@ -587,7 +587,7 @@ { // False means we do NOT let Windows treat this as a legacy application // that needs to be scaled - SdlOpenGLWindow window("Hello", 1024, 1024, false); + SdlOpenGLContext window("Hello", 1024, 1024, false); controller_->FitContent(window.GetCanvasWidth(), window.GetCanvasHeight()); @@ -706,7 +706,6 @@ event.window.event == SDL_WINDOWEVENT_SIZE_CHANGED) { DisableTracker(); // was: tracker.reset(NULL); - compositor_->UpdateSize(); } else if (event.type == SDL_KEYDOWN && event.key.repeat == 0 /* Ignore key bounce */)