SunRed/SpaceCadetPinball
1
0
Fork 0
mirror of https://github.com/k4zmu2a/SpaceCadetPinball.git synced 2025-09-06 16:30:14 +02:00
Code Issues Releases Activity

Main menu bar doesn't cover game area

Browse source
This commit is contained in:
MaikelChan 2021-10-24 15:27:01 +02:00
parent 1525cfae75
commit f46f1f5365
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: B2CE398C279239EC
4 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SpaceCadetPinball/fullscrn.cpp
View file

@ -110,6 +110,8 @@ void fullscrn::window_size_changed()
{ {
int width, height; int width, height;
SDL_GetRendererOutputSize(winmain::Renderer, &width, &height); SDL_GetRendererOutputSize(winmain::Renderer, &width, &height);
int menuHeight = options::Options.ShowMenu ? winmain::MainMenuHeight : 0;
height -= menuHeight;
auto res = &resolution_array[resolution]; auto res = &resolution_array[resolution];
ScaleX = static_cast<float>(width) / res->TableWidth; ScaleX = static_cast<float>(width) / res->TableWidth;
ScaleY = static_cast<float>(height) / res->TableHeight; ScaleY = static_cast<float>(height) / res->TableHeight;
@ -124,7 +126,7 @@ void fullscrn::window_size_changed()
render::DestinationRect = SDL_Rect render::DestinationRect = SDL_Rect
{ {
OffsetX, OffsetY, OffsetX, OffsetY + menuHeight,
width - OffsetX * 2, height - OffsetY * 2 width - OffsetX * 2, height - OffsetY * 2
}; };
} }

1
SpaceCadetPinball/options.cpp
View file

@ -204,6 +204,7 @@ void options::toggle(Menu1 uIDCheckItem)
return; return;
case Menu1::Show_Menu: case Menu1::Show_Menu:
Options.ShowMenu = Options.ShowMenu == 0; Options.ShowMenu = Options.ShowMenu == 0;
fullscrn::window_size_changed();
return; return;
case Menu1::Full_Screen: case Menu1::Full_Screen:
Options.FullScreen ^= true; Options.FullScreen ^= true;

8
SpaceCadetPinball/winmain.cpp
View file

@ -37,6 +37,7 @@ bool winmain::LaunchBallEnabled = true;
bool winmain::HighScoresEnabled = true; bool winmain::HighScoresEnabled = true;
bool winmain::DemoActive = false; bool winmain::DemoActive = false;
char* winmain::BasePath; char* winmain::BasePath;
int winmain::MainMenuHeight = 0;
std::string winmain::FpsDetails; std::string winmain::FpsDetails;
double winmain::UpdateToFrameRatio; double winmain::UpdateToFrameRatio;
winmain::DurationMs winmain::TargetFrameTime; winmain::DurationMs winmain::TargetFrameTime;
@ -341,6 +342,13 @@ void winmain::RenderUi()
if (ImGui::BeginMainMenuBar()) if (ImGui::BeginMainMenuBar())
{ {
if (MainMenuHeight == 0)
{
// Get the height of the main menu bar and update screen coordinates
MainMenuHeight = static_cast<int>(ImGui::GetWindowSize().y);
fullscrn::window_size_changed();
}
if (ImGui::BeginMenu("Game")) if (ImGui::BeginMenu("Game"))
{ {
if (ImGui::MenuItem("New Game", "F2")) if (ImGui::MenuItem("New Game", "F2"))

1
SpaceCadetPinball/winmain.h
View file

@ -49,6 +49,7 @@ public:
static bool HighScoresEnabled; static bool HighScoresEnabled;
static bool DemoActive; static bool DemoActive;
static char* BasePath; static char* BasePath;
static int MainMenuHeight;
static int WinMain(LPCSTR lpCmdLine); static int WinMain(LPCSTR lpCmdLine);
static int event_handler(const SDL_Event* event); static int event_handler(const SDL_Event* event);