Skip to content

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

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
linev merged 2 commits into from
Sep 10, 2026
Merged

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

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
45a826f
[rootcanvas] select canvas window before close
linev Sep 9, 2026
c0ad54e
[gpad] do not select canvas before deleting
linev Sep 9, 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
4 changes: 0 additions & 4 deletions graf2d/gpad/src/TCanvas.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,10 +804,6 @@ void TCanvas::Close(Option_t *option)
TPad::Close(option);

if (!IsBatch() && !IsWeb()) {
//select current canvas
if (fPainter)
fPainter->SelectDrawable(fCanvasID);

DeleteCanvasPainter();

if (fCanvasImp)
Expand Down
6 changes: 5 additions & 1 deletion gui/gui/src/TRootCanvas.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,11 @@ void TRootCanvas::Close()
else gged->Hide();
}

gVirtualX->CloseWindow();
if (fCanvasID != -1) {
gVirtualX->SelectWindow(fCanvasID);
gVirtualX->CloseWindow();
fCanvasID = -1;
}
}

////////////////////////////////////////////////////////////////////////////////
Expand Down
Loading