From c3b927e502782f70e707c5245c68a0f29fbef30d Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sun, 7 Apr 2019 06:59:34 -0400 Subject: [PATCH] - complete the changes from the previous commit for the SDL backend --- src/posix/sdl/gl_sysfb.h | 3 --- src/posix/sdl/sdlglvideo.cpp | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/posix/sdl/gl_sysfb.h b/src/posix/sdl/gl_sysfb.h index 6b1df1cc3..404c45b72 100644 --- a/src/posix/sdl/gl_sysfb.h +++ b/src/posix/sdl/gl_sysfb.h @@ -46,9 +46,6 @@ protected: SDL_GLContext GLContext; void UpdateColors (); - - static const int MIN_WIDTH = 640; - static const int MIN_HEIGHT = 400; }; #endif // __POSIX_SDL_GL_SYSFB_H__ diff --git a/src/posix/sdl/sdlglvideo.cpp b/src/posix/sdl/sdlglvideo.cpp index d92c6fa9a..340947dfd 100644 --- a/src/posix/sdl/sdlglvideo.cpp +++ b/src/posix/sdl/sdlglvideo.cpp @@ -245,7 +245,7 @@ SystemGLFrameBuffer::SystemGLFrameBuffer (void *, bool fullscreen) if (Screen != NULL) { // enforce minimum size limit - SDL_SetWindowMinimumSize(Screen, MIN_WIDTH, MIN_HEIGHT); + SDL_SetWindowMinimumSize(Screen, VID_MIN_WIDTH, VID_MIN_HEIGHT); GLContext = SDL_GL_CreateContext(Screen); if (GLContext != NULL) @@ -340,10 +340,10 @@ int SystemGLFrameBuffer::GetClientHeight() void SystemGLFrameBuffer::SetWindowSize(int w, int h) { - if (w < MIN_WIDTH || h < MIN_HEIGHT) + if (w < VID_MIN_WIDTH || h < VID_MIN_HEIGHT) { - w = MIN_WIDTH; - h = MIN_HEIGHT; + w = VID_MIN_WIDTH; + h = VID_MIN_HEIGHT; } win_w = w; win_h = h;