Skip to content

Fix pad border highlight in GL mode #21911

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 1 commit into from
Apr 15, 2026
+26 −23
Merged

Fix pad border highlight in GL mode #21911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions graf2d/gpad/inc/TCanvas.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ friend class TInterpreter;
//
TVirtualPadPainter *fPainter; ///<! Canvas (pad) painter.

TVirtualPad *fHilightPadBorder = nullptr; ///<! pad which border will be hilghlighrt when paint canvas
Comment thread
linev marked this conversation as resolved.

static Bool_t fgIsFolder; ///< Indicates if canvas can be browsed as a folder

private:
Expand Down
44 changes: 21 additions & 23 deletions graf2d/gpad/src/TCanvas.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1140,30 +1140,28 @@ void TCanvas::FeedbackMode(Bool_t set)

void TCanvas::Flush()
{
if ((fCanvasID == -1) || IsWeb()) return;
if ((fCanvasID == -1) || IsWeb() || IsBatch())
return;

TContext ctxt(this, kTRUE);
if (!IsBatch()) {
if (!UseGL() || fGLDevice == -1) {
fPainter->SelectDrawable(fCanvasID);
gPad = ctxt.GetSaved(); //don't do cd() because than also the pixmap is changed
CopyPixmaps();
fPainter->UpdateDrawable(1);
} else {
TVirtualPS *tvps = gVirtualPS;
gVirtualPS = nullptr;
gGLManager->MakeCurrent(fGLDevice);
fPainter->InitPainter();
Paint();
if (ctxt.GetSaved() && ctxt.GetSaved()->GetCanvas() == this) {
ctxt.GetSaved()->cd();
ctxt.GetSaved()->HighLight(ctxt.GetSaved()->GetHighLightColor());
//cd();
}
fPainter->LockPainter();
gGLManager->Flush(fGLDevice);
gVirtualPS = tvps;
}
if (!UseGL() || fGLDevice == -1) {
fPainter->SelectDrawable(fCanvasID);
CopyPixmaps();
fPainter->UpdateDrawable(1);
} else {
if (IsEditable())
fHilightPadBorder = gPad;

TContext ctxt(this, kTRUE);

TVirtualPS *tvps = gVirtualPS;
gVirtualPS = nullptr;
gGLManager->MakeCurrent(fGLDevice);
fPainter->InitPainter();
Paint();
fPainter->LockPainter();
gGLManager->Flush(fGLDevice);
gVirtualPS = tvps;
fHilightPadBorder = nullptr;
}
}

Expand Down
3 changes: 3 additions & 0 deletions graf2d/gpad/src/TPad.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3629,6 +3629,9 @@ void TPad::Paint(Option_t * /*option*/)
obj->Paint(lnk->GetOption());
lnk = lnk->Next();
}

if (fCanvas && (fCanvas->fHilightPadBorder == this))
PaintBorder(-GetHighLightColor(), kTRUE);
}

fPadPaint = 0;
Expand Down
Loading