openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix window focus bugs for Windows

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-04-21 11:20:02 -05:00
parent 780e722076
commit 07c15dc1e7
9 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/tools/winutil.cpp
View File

@@ -89,4 +89,26 @@ bool check_window_moved(sf::RenderWindow& win, int& winLastX, int& winLastY, std
winLastX = winPosition.x;
winLastY = winPosition.y;
return moved;
}
}
void makeFrontWindow(sf::Window& win) {
static sf::Event evt;
_makeFrontWindow(win);
// Discard GainedFocus events generated by our own meddling:
while(pollEvent(win, evt));
}
void makeFrontWindow(sf::Window& win, sf::Window& prev) {
static sf::Event evt;
_makeFrontWindow(win);
// Discard GainedFocus and LostFocus events generated by our own meddling:
while(pollEvent(win, evt));
while(pollEvent(prev, evt));
}
void setWindowFloating(sf::Window& win, bool floating) {
static sf::Event evt;
_setWindowFloating(win, floating);
// Discard GainedFocus and LostFocus events generated by our own meddling:
while(pollEvent(win, evt));
}

6
src/tools/winutil.hpp
View File

@@ -23,8 +23,14 @@ sf::RenderWindow& mainPtr();
char keyToChar(sf::Keyboard::Key key, bool isShift);
// public-facing overloads which discard events generated by the operation:
void makeFrontWindow(sf::Window& win);
void makeFrontWindow(sf::Window& win, sf::Window& prev);
void setWindowFloating(sf::Window& win, bool floating);
// OS-specific implementations:
void _makeFrontWindow(sf::Window& win);
void _setWindowFloating(sf::Window& win, bool floating);
// Necessary wrapper for sf::Window.pollEvent()
bool pollEvent(sf::Window& win, sf::Event& event);

4
src/tools/winutil.linux.cpp
View File

@@ -91,10 +91,10 @@ std::string get_os_version() {
return version.str();
}
void makeFrontWindow(sf::Window& win) {
void _makeFrontWindow(sf::Window& win) {
}
void setWindowFloating(sf::Window& win, bool floating) {
void _setWindowFloating(sf::Window& win, bool floating) {
// Code adapted from <http://stackoverflow.com/a/16235920>
auto display = XOpenDisplay(NULL);
Atom wmStateAbove = XInternAtom(display, "_NET_WM_STATE_ABOVE", true);

4
src/tools/winutil.mac.mm
View File

@@ -83,7 +83,7 @@ std::string get_os_version() {
return os.str();
}
void makeFrontWindow(sf::Window& win) {
void _makeFrontWindow(sf::Window& win) {
sf::WindowHandle handle = win.getSystemHandle();
id nsHandle = id(handle);
if([nsHandle isKindOfClass: [NSWindow class]]) {
@@ -92,7 +92,7 @@ void makeFrontWindow(sf::Window& win) {
}
}
void setWindowFloating(sf::Window& win, bool floating) {
void _setWindowFloating(sf::Window& win, bool floating) {
sf::WindowHandle handle = win.getSystemHandle();
id nsHandle = id(handle);
if([nsHandle isKindOfClass: [NSWindow class]]) {

8
src/tools/winutil.win.cpp
View File

@@ -144,15 +144,15 @@ std::string get_os_version() {
return version.str();
}
void makeFrontWindow(sf::Window& win) {
void _makeFrontWindow(sf::Window& win) {
HWND win_handle = win.getSystemHandle();
BringWindowToTop(win_handle);
}
void setWindowFloating(sf::Window& win, bool floating) {
void _setWindowFloating(sf::Window& win, bool floating) {
HWND win_handle = win.getSystemHandle();
UINT flags = SWP_NOMOVE | SWP_NOSIZE;
HWND newPos = floating ? HWND_TOPMOST : HWND_TOP;
UINT flags = SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE;
HWND newPos = floating ? HWND_TOPMOST : HWND_BOTTOM;
// The flags param specifies that these 0's are ignored.
SetWindowPos(win_handle, newPos, 0, 0, 0, 0, flags);
}