Skip to content

Close existing dialogs consistently when opening game windows - #175

Open
Rokk001 wants to merge 56 commits into
tomluchowski:shaders-improvementfrom
Rokk001:pr/exclusive-windows-2026-09
Open

Rokk001 wants to merge 56 commits into
tomluchowski:shaders-improvementfrom
Rokk001:pr/exclusive-windows-2026-09

Conversation

@Rokk001

@Rokk001 Rokk001 commented Sep 27, 2026 •

Copy link
Copy Markdown

Reuse the existing close dispatcher when opening objectives, options, help, player settings, camera definitions and settings navigation, preserving submenu return behavior and avoiding recursive end-game Back handling.

Based on #172 and its published prerequisites. The default comparison is cumulative (51 commits); this contribution adds one focused functional commit plus an upstream integration merge. Merge prerequisites separately and recheck the remaining diff before merging.

Contribution-only comparison.

Validation: The original installed-CEGUI probe passed 624 checks, with 48 failures before the correction, and the fork Release build passed; the isolated translation unit passes fresh MSVC syntax/type checking, with all six insertion sites checked against the original implementation.

Limits: no new full-game or multiplayer run is claimed; no new Linux build was performed. Native regression reruns are currently blocked by Windows application-control policy; historical native results above are not claimed as fresh runs.

Issue coverage: Addresses overlapping game windows within #6, not that issue's complete scope.

No version, README or changelog change is required for restoring existing dialog exclusivity; save data and packets are unchanged.

Upstream integration: the branch also includes the current default branch. The accepted HUD grid and bounded spell progress bars are preserved, and the upstream community-panel widget is retained. XML structure/non-overlap checks and fresh syntax/type compilation of all three affected translation units pass. The contribution-only link above still selects the functional commit, excluding this merge.


Supersedes #123, closed and force-pushed by mistake; recreated with the same content and cleaned-up commit trailers.

Rokk001 and others added 30 commits September 7, 2026 00:29
Embed per-monitor DPI awareness and maintain the verified OGRE 13.6.5 renderer patch required for context-safe window replacement, runtime GL options and correct fullscreen client geometry.

Validation: clean Release build, DPI and 3440x1440 fullscreen probes, three GL3Plus variants and the patch reverse check passed; version 0.7.1 remains unchanged because this is unreleased work and the project has no changelog.
Apply display, input, audio, gameplay, minimap, shadow and negotiated nickname changes to the running session while preserving rollback for failed window or input transitions and keeping the 3440x1440 navigation visible.

Validation: clean Release and Debug builds, packet tests, DPI, layout and GL3Plus probes passed; the user confirmed the reported resolution, fullscreen, cursor, flicker and navigation failures are fixed. Version 0.7.1 remains unchanged because this is unreleased work and the project has no changelog.
The spells tab put its ten buttons in a single row of 60 pixel squares running
out to x=700. The pane they live in is the window width minus the 200 pixels of
minimap, so at the 800 wide minimum window it is 600 pixels across, and the last
two spells, Weakness and the Eye of Evil, hung past its right edge where they
could be neither seen nor clicked. Only a window at least 900 wide showed the
whole row, and nothing said so.

The rooms tab solved the same problem long ago: two rows of 40 pixel buttons.
The spells tab now uses the same shape, five spells to a row, ending at x=300
with room to spare at any size the game accepts. The cooldown bar inside each
button now covers exactly its button too, instead of overhanging 20 pixels on
both sides, which with narrower buttons would have bled half way across the
neighbours.

The rooms tab had the tail of the same bug: the temple and portal buttons the
editor uses sat at x=570 to 690, past the same edge. They join the end of the
second row instead.

(cherry picked from commit 10db1cb)
The README documents production access and reordering; save ordering remains supplied by tomluchowski#100 and new messages require matching endpoints, without a new release-version claim.
No version, README or changelog change is required for restoring existing dialog exclusivity; save data and packets are unchanged.
Include the upstream community panel and worker effect; retain the existing non-overlapping HUD grid and bounded spell progress bars.
XML structure, geometry and changed C++ syntax/type checks pass.
No additional version or README change is required.
Replace the auto declarations introduced by this branch with explicit types,
as requested in issue tomluchowski#42 and required by CLAUDE.md. No behavioural change.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants