Skip to content

[rootcanvas] select canvas x11 window before closing it [6.40] - #23310

Merged
linev merged 2 commits into
root-project:v6-40-00-patchesfrom
linev:canvas_close_640
Sep 10, 2026
Merged

[rootcanvas] select canvas x11 window before closing it [6.40]#23310
linev merged 2 commits into
root-project:v6-40-00-patchesfrom
linev:canvas_close_640

Conversation

@linev

@linev linev commented Sep 9, 2026

Copy link
Copy Markdown
Member

Backport of fixes from bigger PR #23312

Correctly select canvas window in TRootCanvas before closing it.
Before gVirtualX->SelectWindow(fCanvasID) was done in the TCanvas::Close(),
but it was replaced by fPainter->SelectDrawable(fCanvasID).
For the case of GL it does not really select gVirtualX window.

After such change selection can be removed from TCanvas::Close()

Before it was hapenning in TCanvas::Close() but
we removing gVirtualX from there.
Therefore do it explicitely already in TRootCanvas::Close()
Now it happens in the canvas implementation and therefore not necessary.
@linev linev added this to the 6.40.06 milestone Sep 9, 2026
@linev linev self-assigned this Sep 9, 2026
@linev
linev requested review from bellenot and couet as code owners September 9, 2026 11:34
@github-actions

github-actions Bot commented Sep 9, 2026

Copy link
Copy Markdown

Test Results

    18 files      18 suites   2d 22h 20m 30s ⏱️
 3 876 tests  3 876 ✅ 0 💤 0 ❌
62 457 runs  62 457 ✅ 0 💤 0 ❌

Results for commit c0ad54e.

@linev
linev merged commit c3094da into root-project:v6-40-00-patches Sep 10, 2026
33 of 37 checks passed
@linev
linev deleted the canvas_close_640 branch September 10, 2026 12:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants