zhenyan121/Cubed
1
0
Fork 0
mirror of https://github.com/zhenyan121/Cubed.git synced 2026-08-08 17:57:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: windows ime fail on fullscreen

Browse Source
This commit is contained in:
zhenyan121
2026-07-17 16:22:50 +08:00
parent cb7587857d
commit fa38b20a3e
2 changed files with 56 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Cubed/window.hpp
View File

@@ -53,6 +53,8 @@ private:
SDL_GLContext m_context; SDL_GLContext m_context;
int m_window_width = 0; int m_window_width = 0;
int m_window_height = 0; int m_window_height = 0;
SDL_DisplayID m_windowed_display = 0;
bool m_fullscreen = false;
Config& m_config; Config& m_config;
Camera* m_camera = nullptr; Camera* m_camera = nullptr;
bool m_imgui_enable = false; bool m_imgui_enable = false;

65
src/window.cpp
View File

@@ -140,9 +140,8 @@ void Window::init(const Argument& argument) {
m_window = SDL_CreateWindow("Cubed", m_window_width, m_window_height, m_window = SDL_CreateWindow("Cubed", m_window_width, m_window_height,
SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE |
SDL_WINDOW_HIGH_PIXEL_DENSITY); SDL_WINDOW_HIGH_PIXEL_DENSITY);
if (m_config.get("window.fullscreen", false)) {
SDL_SetWindowFullscreen(m_window, true); set_fullscreen(m_config.get("window.fullscreen", false));
}
m_context = SDL_GL_CreateContext(m_window); m_context = SDL_GL_CreateContext(m_window);
SDL_GL_MakeCurrent(m_window, m_context); SDL_GL_MakeCurrent(m_window, m_context);
@@ -173,9 +172,9 @@ void Window::reload_config() {
set_fullscreen(m_config.get("window.fullscreen", false)); set_fullscreen(m_config.get("window.fullscreen", false));
if (!m_mouse_enable) { if (!m_mouse_enable) {
SDL_SetWindowRelativeMouseMode(m_window, false); disable_mouse();
} else { } else {
SDL_SetWindowRelativeMouseMode(m_window, true); enable_mouse();
} }
m_config.set("window.width", windowed_width); m_config.set("window.width", windowed_width);
m_config.set("window.height", windowed_height); m_config.set("window.height", windowed_height);
@@ -183,9 +182,7 @@ void Window::reload_config() {
void Window::toggle_fullscreen() { void Window::toggle_fullscreen() {
bool is_fullscreen = if (m_fullscreen) {
(SDL_GetWindowFlags(m_window) & SDL_WINDOW_FULLSCREEN) != 0;
if (is_fullscreen) {
set_fullscreen(false); set_fullscreen(false);
} else { } else {
set_fullscreen(true); set_fullscreen(true);
@@ -195,18 +192,64 @@ void Window::toggle_fullscreen() {
m_config.set("window.height", windowed_height); m_config.set("window.height", windowed_height);
} }
void Window::set_fullscreen(bool full) { void Window::set_fullscreen(bool full) {
if (full == m_fullscreen)
return;
if (full) { if (full) {
// If the window is maximized, restore it first.
if (SDL_GetWindowFlags(m_window) & SDL_WINDOW_MAXIMIZED) {
SDL_RestoreWindow(m_window);
}
SDL_GetWindowPosition(m_window, &windowed_xpos, &windowed_ypos); SDL_GetWindowPosition(m_window, &windowed_xpos, &windowed_ypos);
SDL_GetWindowSize(m_window, &windowed_width, &windowed_height); SDL_GetWindowSize(m_window, &windowed_width, &windowed_height);
SDL_SetWindowFullscreen(m_window, true);
m_windowed_display = SDL_GetDisplayForWindow(m_window);
SDL_Rect display_bounds{};
if (!SDL_GetDisplayBounds(m_windowed_display, &display_bounds)) {
Logger::error("SDL_GetDisplayBounds failed: {}", SDL_GetError());
return;
}
SDL_SetWindowBordered(m_window, false);
SDL_SetWindowPosition(m_window, display_bounds.x, display_bounds.y);
SDL_SetWindowSize(m_window, display_bounds.w, display_bounds.h);
SDL_RaiseWindow(m_window);
m_fullscreen = true;
m_config.set("window.fullscreen", true); m_config.set("window.fullscreen", true);
} else { } else {
SDL_SetWindowFullscreen(m_window, false);
SDL_SetWindowPosition(m_window, windowed_xpos, windowed_ypos); SDL_SetWindowBordered(m_window, true);
SDL_SetWindowSize(m_window, windowed_width, windowed_height); SDL_SetWindowSize(m_window, windowed_width, windowed_height);
SDL_SetWindowPosition(m_window, windowed_xpos, windowed_ypos);
SDL_RaiseWindow(m_window);
m_fullscreen = false;
m_config.set("window.fullscreen", false); m_config.set("window.fullscreen", false);
} }
int w, h;
SDL_GetWindowSize(m_window, &w, &h);
SDL_Event event{};
event.type = SDL_EVENT_WINDOW_RESIZED;
event.window.data1 = w;
event.window.data2 = h;
event.window.windowID = SDL_GetWindowID(m_window);
SDL_PushEvent(&event);
SDL_Rect ime_rect{0, 0, 1, 1};
SDL_SetTextInputArea(m_window, &ime_rect, 0);
} }
void Window::enable_mouse() { void Window::enable_mouse() {
SDL_WarpMouseInWindow(m_window, width() / 2, height() / 2); SDL_WarpMouseInWindow(m_window, width() / 2, height() / 2);