Skip to content

Window border toggle #2535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PanMenel wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Window border toggle #2535

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6f39652
Update InputConfigDialog.h
PanMenel Dec 18, 2025
fc2b34d
This should work I guess
PanMenel Dec 18, 2025
fcf6a8f
Gówno fix usuwający feature
PanMenel Dec 18, 2025
5dcc694
fix gówno fixa i guess
PanMenel Dec 18, 2025
29a92d3
Epic update, i hope it works XD
PanMenel Dec 18, 2025
1dc324a
fix better buildu
PanMenel Dec 18, 2025
e4a2672
fix fixa XD
PanMenel Dec 18, 2025
bfb988b
i am so fucking stupid fix
PanMenel Dec 18, 2025
814ad81
Update README.md
PanMenel Dec 18, 2025
d03f875
Update README.md
PanMenel Dec 18, 2025
baf8bfa
Update README.md
PanMenel Dec 18, 2025
1690b03
Cosmetic changes to ReadMe
PanMenel Dec 18, 2025
e37fa68
my stupid ass added button traping users
PanMenel Dec 18, 2025
14805c1
fix because unused code
PanMenel Dec 18, 2025
1a76845
even stupider case for a fix
PanMenel Dec 18, 2025
0c04ac3
more unused code
PanMenel Dec 19, 2025
e389058
revert on readme
PanMenel Dec 19, 2025
8bdda09
Reworked EmuInstanceInput.cpp to not touch existing code and made it …
PanMenel Dec 19, 2025
f93c230
if function shift to look more clean
PanMenel Dec 19, 2025
3b75b1e
Full Rewrite to fit more into melonds code
PanMenel Dec 19, 2025
9f9bb74
Merge branch 'melonDS-emu:master' into Menubartoggle
PanMenel Dec 30, 2025
d35cdbd
Merge branch 'melonDS-emu:master' into Menubartoggle
PanMenel Jan 6, 2026
5de7dac
All changes to convert menubar to windowborder
PanMenel Jan 7, 2026
b55c511
just some integrity fixes
PanMenel Jan 7, 2026
f56abcd
Merge branch 'melonDS-emu:master' into WindowBorderToggle
PanMenel Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/frontend/qt_sdl/Config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ LegacyEntry LegacyFile[] =
{"HKKey_FastForward", 0, "Keyboard.HK_FastForward", true},
{"HKKey_FastForwardToggle", 0, "Keyboard.HK_FrameLimitToggle", true},
{"HKKey_FullscreenToggle", 0, "Keyboard.HK_FullscreenToggle", true},
{"HKKey_WindowBorderToggle", 0, "Keyboard.HK_WindowBorderToggle", true},
{"HKKey_SwapScreens", 0, "Keyboard.HK_SwapScreens", true},
{"HKKey_SwapScreenEmphasis", 0, "Keyboard.HK_SwapScreenEmphasis", true},
{"HKKey_SolarSensorDecrease", 0, "Keyboard.HK_SolarSensorDecrease", true},
Expand All @@ -182,6 +183,7 @@ LegacyEntry LegacyFile[] =
{"HKJoy_FastForward", 0, "Joystick.HK_FastForward", true},
{"HKJoy_FastForwardToggle", 0, "Joystick.HK_FrameLimitToggle", true},
{"HKJoy_FullscreenToggle", 0, "Joystick.HK_FullscreenToggle", true},
{"HKJoy_WindowBorderToggle", 0, "Joystick.HK_WindowBorderToggle", true},
{"HKJoy_SwapScreens", 0, "Joystick.HK_SwapScreens", true},
{"HKJoy_SwapScreenEmphasis", 0, "Joystick.HK_SwapScreenEmphasis", true},
{"HKJoy_SolarSensorDecrease", 0, "Joystick.HK_SolarSensorDecrease", true},
Expand Down
1 change: 1 addition & 0 deletions src/frontend/qt_sdl/EmuInstance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ enum
HK_GuitarGripRed,
HK_GuitarGripYellow,
HK_GuitarGripBlue,
HK_WindowBorderToggle,
HK_MAX
};

Expand Down
1 change: 1 addition & 0 deletions src/frontend/qt_sdl/EmuInstanceInput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ const char* EmuInstance::hotkeyNames[HK_MAX] =
"HK_FastForward",
"HK_FrameLimitToggle",
"HK_FullscreenToggle",
"HK_WindowBorderToggle",
"HK_SwapScreens",
"HK_SwapScreenEmphasis",
"HK_SolarSensorDecrease",
Expand Down
3 changes: 3 additions & 0 deletions src/frontend/qt_sdl/EmuThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ void EmuThread::attachWindow(MainWindow* window)
connect(this, SIGNAL(windowEmuReset()), window, SLOT(onEmuReset()));
connect(this, SIGNAL(autoScreenSizingChange(int)), window->panel, SLOT(onAutoScreenSizingChanged(int)));
connect(this, SIGNAL(windowFullscreenToggle()), window, SLOT(onFullscreenToggled()));
connect(this, SIGNAL(windowBorderToggle()), window, SLOT(onWindowBorderToggled()));
connect(this, SIGNAL(screenEmphasisToggle()), window, SLOT(onScreenEmphasisToggled()));

if (window->winHasMenu())
Expand All @@ -95,6 +96,7 @@ void EmuThread::detachWindow(MainWindow* window)
disconnect(this, SIGNAL(windowEmuReset()), window, SLOT(onEmuReset()));
disconnect(this, SIGNAL(autoScreenSizingChange(int)), window->panel, SLOT(onAutoScreenSizingChanged(int)));
disconnect(this, SIGNAL(windowFullscreenToggle()), window, SLOT(onFullscreenToggled()));
disconnect(this, SIGNAL(windowBorderToggle()), window, SLOT(onWindowBorderToggled()));
disconnect(this, SIGNAL(screenEmphasisToggle()), window, SLOT(onScreenEmphasisToggled()));

if (window->winHasMenu())
Expand Down Expand Up @@ -165,6 +167,7 @@ void EmuThread::run()
if (emuInstance->hotkeyPressed(HK_FrameStep)) emuFrameStep();

if (emuInstance->hotkeyPressed(HK_FullscreenToggle)) emit windowFullscreenToggle();
if (emuInstance->hotkeyPressed(HK_WindowBorderToggle)) emit windowBorderToggle();

if (emuInstance->hotkeyPressed(HK_SwapScreens)) emit swapScreensToggle();
if (emuInstance->hotkeyPressed(HK_SwapScreenEmphasis)) emit screenEmphasisToggle();
Expand Down
1 change: 1 addition & 0 deletions src/frontend/qt_sdl/EmuThread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ class EmuThread : public QThread
void autoScreenSizingChange(int sizing);

void windowFullscreenToggle();
void windowBorderToggle();

void swapScreensToggle();
void screenEmphasisToggle();
Expand Down
2 changes: 2 additions & 0 deletions src/frontend/qt_sdl/InputConfig/InputConfigDialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ static constexpr std::initializer_list<int> hk_general =
HK_SlowMoToggle,
HK_FrameLimitToggle,
HK_FullscreenToggle,
HK_WindowBorderToggle,
HK_Lid,
HK_Mic,
HK_SwapScreens,
Expand All @@ -81,6 +82,7 @@ static constexpr std::initializer_list<const char*> hk_general_labels =
"Toggle slow mo",
"Toggle FPS limit",
"Toggle fullscreen",
"Toggle window border",
"Close/open lid",
"Microphone",
"Swap screens",
Expand Down
18 changes: 18 additions & 0 deletions src/frontend/qt_sdl/Window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2227,6 +2227,24 @@ void MainWindow::onFullscreenToggled()
toggleFullscreen();
}

void MainWindow::onWindowBorderToggled()
{
#ifdef _WIN32
HWND hwnd = (HWND)winId();
LONG style = GetWindowLong(hwnd, GWL_STYLE);

if (style & WS_CAPTION) {
style &= ~(WS_CAPTION | WS_THICKFRAME);
} else {
style |= WS_CAPTION | WS_THICKFRAME;
}

SetWindowLong(hwnd, GWL_STYLE, style);
SetWindowPos(hwnd, nullptr, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
#endif
Comment on lines +2215 to +2228

This comment was marked as off-topic.

Sign in to view

Copy link
Author

@PanMenel PanMenel Jan 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You must have misinterpreted this commit. This one is for windows border, like with minimizing and closing options. You should refer to #2528 which uses code in line with what you are saying. Yeah, I know it is only windows (for now) but it does its job, I could improve it in the future, but there is no need for now. And Sorry for confusion :p

Copy link
Author

@PanMenel PanMenel Jan 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just changed the title to more resemble what it really does.

}

void MainWindow::onScreenEmphasisToggled()
{
int currentSizing = windowCfg.GetInt("ScreenSizing");
Expand Down
1 change: 1 addition & 0 deletions src/frontend/qt_sdl/Window.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ private slots:
void onUpdateVideoSettings(bool glchange);

void onFullscreenToggled();
void onWindowBorderToggled();
void onScreenEmphasisToggled();

private:
Expand Down