ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Frontend: Move fullscreen to settings menu

This commit is contained in:
Connor McLaughlin 2019-10-04 20:49:43 +10:00
parent 162a0df922
commit d3ecad391d
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/duckstation/sdl_interface.cpp
View File

@ -512,16 +512,13 @@ void SDLInterface::RenderMainMenuBar()
ImGui::EndMenu(); ImGui::EndMenu();
} }
if (ImGui::BeginMenu("View")) if (ImGui::BeginMenu("Settings"))
{ {
if (ImGui::MenuItem("Fullscreen", nullptr, IsWindowFullscreen())) if (ImGui::MenuItem("Fullscreen", nullptr, IsWindowFullscreen()))
SDL_SetWindowFullscreen(m_window, IsWindowFullscreen() ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP); SDL_SetWindowFullscreen(m_window, IsWindowFullscreen() ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP);
ImGui::EndMenu(); ImGui::Separator();
}
if (ImGui::BeginMenu("Settings"))
{
if (ImGui::BeginMenu("GPU")) if (ImGui::BeginMenu("GPU"))
{ {
if (ImGui::BeginMenu("Internal Resolution")) if (ImGui::BeginMenu("Internal Resolution"))
@ -529,10 +526,9 @@ void SDLInterface::RenderMainMenuBar()
const u32 current_internal_resolution = m_system->GetSettings().gpu_resolution_scale; const u32 current_internal_resolution = m_system->GetSettings().gpu_resolution_scale;
for (u32 scale = 1; scale <= 16; scale++) for (u32 scale = 1; scale <= 16; scale++)
{ {
bool selected = current_internal_resolution == scale;
if (ImGui::MenuItem( if (ImGui::MenuItem(
TinyString::FromFormat("%ux (%ux%u)", scale, scale * GPU::VRAM_WIDTH, scale * GPU::VRAM_HEIGHT), TinyString::FromFormat("%ux (%ux%u)", scale, scale * GPU::VRAM_WIDTH, scale * GPU::VRAM_HEIGHT),
nullptr, &selected)) nullptr, current_internal_resolution == scale))
{ {
m_system->GetSettings().gpu_resolution_scale = scale; m_system->GetSettings().gpu_resolution_scale = scale;
m_system->UpdateSettings(); m_system->UpdateSettings();
@ -562,7 +558,7 @@ void SDLInterface::RenderMainMenuBar()
ImGui::EndMenu(); ImGui::EndMenu();
} }
ImGui::SetCursorPosX(ImGui::GetIO().DisplaySize.x - 205.0f); ImGui::SetCursorPosX(ImGui::GetIO().DisplaySize.x - 210.0f);
const u32 rounded_speed = static_cast<u32>(std::round(m_speed)); const u32 rounded_speed = static_cast<u32>(std::round(m_speed));
if (m_speed < 90.0f) if (m_speed < 90.0f)