mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Only checks window size during platform_resize() now 

Removed platform_update_config_window_size()
This commit is contained in:
Robert Jordan 2015-05-11 14:51:13 -04:00
parent 40efb2c0d6
commit 37ff266fc6
3 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/platform/platform.h
View File

@ -80,7 +80,6 @@ void platform_process_messages();
int platform_scancode_to_rct_keycode(int sdl_key);
void platform_start_text_input(char* buffer, int max_length);
void platform_stop_text_input();
void platform_update_config_window_size();
// Platform specific definitions
char platform_get_path_separator();

30
src/platform/shared.c
View File

@ -191,6 +191,7 @@ static void platform_resize(int width, int height)
rct_drawpixelinfo *screenDPI;
int newScreenBufferSize;
void *newScreenBuffer;
uint32 flags;
if (_surface != NULL)
SDL_FreeSurface(_surface);
@ -247,6 +248,18 @@ static void platform_resize(int width, int height)
window_relocate_windows(width, height);
gfx_invalidate_screen();
// Check if the window has been resized in windowed mode and update the config file accordingly
// This is called in rct2_update_2 and is only called after resizing a window has finished
flags = SDL_GetWindowFlags(gWindow);
if ((flags & (SDL_WINDOW_MAXIMIZED | SDL_WINDOW_MINIMIZED |
SDL_WINDOW_FULLSCREEN | SDL_WINDOW_FULLSCREEN_DESKTOP)) == 0) {
if (width != gConfigGeneral.window_width || height != gConfigGeneral.window_height) {
gConfigGeneral.window_width = width;
gConfigGeneral.window_height = height;
config_save_default();
}
}
}
void platform_update_palette(char* colours, int start_index, int num_colours)
@ -453,23 +466,6 @@ static void platform_close_window()
platform_unload_cursors();
}
void platform_update_config_window_size()
{
// Check if the window has been resized in windowed mode and update the config file accordingly
// This is called in rct2_update_2 and is only called after resizing a window has finished
int width, height;
uint32 flags = SDL_GetWindowFlags(gWindow);
if ((flags & (SDL_WINDOW_MAXIMIZED | SDL_WINDOW_MINIMIZED |
SDL_WINDOW_FULLSCREEN | SDL_WINDOW_FULLSCREEN_DESKTOP)) == 0) {
SDL_GetWindowSize(gWindow, &width, &height);
if (width != gConfigGeneral.window_width || height != gConfigGeneral.window_height) {
gConfigGeneral.window_width = width;
gConfigGeneral.window_height = height;
config_save_default();
}
}
}
void platform_init()
{
platform_create_window();

3
src/rct2.c
View File

@ -345,9 +345,6 @@ void rct2_update_2()
title_update();
else
game_update();
// Update the windowed mode size in the config file if needed
platform_update_config_window_size();
}
void rct2_endupdate()