Skip to content

Zoom related fixes #2412

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
lynxlynxlynx merged 2 commits into from
Dec 8, 2025
Merged

Zoom related fixes #2412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce0f8e2
WindowManager: checking for `GameControl` before applying zoom
MarcelHB Dec 8, 2025
5cf3a46
Window: adjusts disabled-overlay to actual draw size
MarcelHB Dec 8, 2025
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
4 changes: 4 additions & 0 deletions gemrb/core/GUI/Window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,10 @@ void Window::DrawAfterSubviews(const Region& /*drawFrame*/, const Region& /*clip
{
if (IsDisabled()) {
Region winrgn(Point(), Dimensions());
if (scaleBuffer) {
winrgn.size = scaleBuffer->Rect().size;
}

VideoDriver->DrawRect(winrgn, ColorBlack, true, BlitFlags::HALFTRANS | BlitFlags::BLENDED);
}
}
Expand Down
11 changes: 7 additions & 4 deletions gemrb/core/GUI/WindowManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,10 +611,13 @@ void WindowManager::DrawWindows() const
// draw the game window now (beneath everything else); it's not part of the windows collection
if (gameWin->IsVisible()) {
auto gameControl = core->GetGameControl();
if (gameControl->GetScalePercent() != 100) {
gameWin->UseScaleBuffer(gameControl->GetScalePercent());
} else {
gameWin->DropScaleBuffer();
if (gameControl) {
auto scale = gameControl->GetScalePercent();
if (scale != 100) {
gameWin->UseScaleBuffer(scale);
} else {
gameWin->DropScaleBuffer();
}
}

gameWin->Draw();
Expand Down
Loading