Skip to content

Fix cursor visibility on startup and focus #980

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

Merged
Try merged 4 commits into from
Sep 13, 2026
Merged

Fix cursor visibility on startup and focus #980

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a71e9f1
Fix cursor visibility on startup and focus
Abendlied Sep 3, 2026
3c70e1d
Fix cursor visibility in fullscreen mode
Abendlied Sep 11, 2026
89c8fb4
cancel submodule change (no dependency there)
Try Sep 13, 2026
6eba9d2
Merge branch 'master' into fix-cursor-visibility
Try Sep 13, 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
17 changes: 10 additions & 7 deletions common/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@ MainWindow::MainWindow(Device& device)
setWindowTitle("Gothic II"); else
setWindowTitle("Gothic");

if(!CommandLine::inst().isWindowMode())
if(!CommandLine::inst().isWindowMode()) {
setFullscreen(true);
setCursorShape(CursorShape::Hidden);
}

//renderer.resetSwapchain();
setupUi();
Expand Down Expand Up @@ -295,10 +297,10 @@ void MainWindow::resizeEvent(SizeEvent&) {
if(auto camera = Gothic::inst().camera())
camera->setViewport(swapchain.w(),swapchain.h());

const bool fs = SystemApi::isFullscreen(hwnd());
auto rect = SystemApi::windowClientRect(hwnd());
setCursorPosition(rect.w/2,rect.h/2);
setCursorShape(fs ? CursorShape::Hidden : CursorShape::Arrow);
if(SystemApi::isFullscreen(hwnd())) {
setCursorPosition(Point(w()/2,h()/2));
}

dMouse = Point();
}

Expand Down Expand Up @@ -560,8 +562,9 @@ void MainWindow::focusEvent(FocusEvent &event) {
if(!event.in)
return;
dMouse = Point();
auto center = Point(w()/2,h()/2);
setCursorPosition(center);

if(SystemApi::isFullscreen(hwnd()))
setCursorPosition(Point(w()/2,h()/2));
}

void MainWindow::paintFocus(Painter& p, const Focus& focus, const Matrix4x4& vp) {
Expand Down