Skip to content

Commit 0efba78

Browse files
committed
Align fullscreen feature implementation
1 parent 803ff97 commit 0efba78

4 files changed

Lines changed: 7 additions & 4 deletions

File tree

platforms/shared/desktop/application.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,14 +220,17 @@ void application_trigger_fullscreen(bool fullscreen)
220220
}
221221
else
222222
{
223-
// Desktop fullscreen: no display mode
223+
// Borderless fullscreen (default): pass NULL for desktop fullscreen
224224
SDL_SetWindowFullscreenMode(application_sdl_window, NULL);
225225
}
226+
226227
SDL_SetWindowFullscreen(application_sdl_window, true);
228+
SDL_ERROR("SDL_SetWindowFullscreen");
227229
}
228230
else
229231
{
230232
SDL_SetWindowFullscreen(application_sdl_window, false);
233+
SDL_ERROR("SDL_SetWindowFullscreen");
231234
}
232235
config_emulator.fullscreen = fullscreen;
233236
#endif

platforms/shared/desktop/config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ void config_read(void)
279279

280280
config_emulator.maximized = read_bool("Emulator", "Maximized", false);
281281
config_emulator.fullscreen = read_bool("Emulator", "FullScreen", false);
282-
config_emulator.fullscreen_mode = read_int("Emulator", "FullScreenMode", 1);
282+
config_emulator.fullscreen_mode = read_int("Emulator", "FullScreenMode", 0);
283283
config_emulator.always_show_menu = read_bool("Emulator", "AlwaysShowMenu", false);
284284
config_emulator.ffwd_speed = read_int("Emulator", "FFWD", 1);
285285
config_emulator.save_slot = read_int("Emulator", "SaveSlot", 0);

platforms/shared/desktop/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ struct config_Emulator
4646
{
4747
bool maximized = false;
4848
bool fullscreen = false;
49-
int fullscreen_mode = 1;
49+
int fullscreen_mode = 0;
5050
bool always_show_menu = false;
5151
bool paused = false;
5252
int save_slot = 0;

platforms/shared/desktop/gui_menus.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ static void menu_video(void)
702702
if (ImGui::BeginMenu("Fullscreen Mode"))
703703
{
704704
ImGui::PushItemWidth(130.0f);
705-
ImGui::Combo("##fullscreen_mode", &config_emulator.fullscreen_mode, "Full Screen Desktop\0Full Screen\0\0");
705+
ImGui::Combo("##fullscreen_mode", &config_emulator.fullscreen_mode, "Borderless\0Exclusive\0\0");
706706
ImGui::PopItemWidth();
707707
ImGui::EndMenu();
708708
}

0 commit comments

Comments
 (0)