mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-06 23:45:07 +00:00
Code Issues Projects Releases Wiki Activity

Use SDL2's fake fullscreen mode instead of the exclusive one.

Browse Source 
Also don't maximize the window before toggling fullscreen and hide the mouse pointer if the window size equals the desktop size to also account for the macOS native fullscreen toggle.
This commit is contained in:
Kai Blaschke
2021-08-10 16:21:37 +02:00
parent afae7c5e46
commit d402c1e3ec
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/projectM-sdl/pmSDL.cpp
View File

@ -63,19 +63,6 @@ void projectMSDL::setHelpText(const std::string& helpText)
projectm_set_help_text(_projectM, helpText.c_str());
}
void projectMSDL::maximize()
{
SDL_DisplayMode dm;
if (SDL_GetDesktopDisplayMode(0, &dm) != 0)
{
SDL_Log("SDL_GetDesktopDisplayMode failed: %s", SDL_GetError());
return;
}
SDL_SetWindowSize(win, dm.w, dm.h);
resize(dm.w, dm.h);
}
/* Stretch projectM across multiple monitors */
void projectMSDL::stretchMonitors()
{
@ -153,7 +140,6 @@ void projectMSDL::nextMonitor()
void projectMSDL::toggleFullScreen()
{
maximize();
if (isFullScreen)
{
SDL_SetWindowFullscreen(win, 0);
@ -163,7 +149,7 @@ void projectMSDL::toggleFullScreen()
else
{
SDL_ShowCursor(false);
SDL_SetWindowFullscreen(win, SDL_WINDOW_FULLSCREEN);
SDL_SetWindowFullscreen(win, SDL_WINDOW_FULLSCREEN_DESKTOP);
isFullScreen = true;
}
}
@ -355,7 +341,14 @@ void projectMSDL::resize(unsigned int width_, unsigned int height_)
{
width = width_;
height = height_;
projectm_set_window_size(_projectM, width, height);
// Hide cursor if window size equals desktop size
SDL_DisplayMode dm;
if (SDL_GetDesktopDisplayMode(0, &dm) == 0) {
SDL_ShowCursor(isFullScreen ? SDL_DISABLE : SDL_ENABLE);
}
projectm_set_window_size(_projectM, width, height);
}
void projectMSDL::pollEvent()

1
src/projectM-sdl/pmSDL.hpp
View File

@ -122,7 +122,6 @@ public:
void setHelpText(const std::string& theValue);
void renderFrame();
void pollEvent();
void maximize();
bool keymod = false;
std::string getActivePresetName();
void addFakePCM();