Skip to content

[graphics] fix crash during objects dragging, improve TLine::ExecuteEvent #21872

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 5 commits into from
Apr 10, 2026
Merged

[graphics] fix crash during objects dragging, improve TLine::ExecuteEvent #21872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff8b607
[tline] prevent crash when press Esc during dragging
linev Apr 9, 2026
fdd8996
[tbox] prevent crash when press Esc during dragging
linev Apr 9, 2026
eaf9e4f
[tellipse] prevent crash when press Esc during dragging
linev Apr 9, 2026
ab12ca1
[tline] use pad painter in ExecuteEvent
linev Apr 9, 2026
c2af043
[tbox] reduce gPad usage in ExecuteEvent
linev Apr 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
93 changes: 38 additions & 55 deletions graf2d/graf/src/TBox.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,21 +238,20 @@ void TBox::ExecuteEvent(Int_t event, Int_t px, Int_t py)

Bool_t isBox = !(InheritsFrom("TPave") || InheritsFrom("TWbox"));

const Int_t kMaxDiff = 7;
const Int_t kMinSize = 20;
constexpr Int_t kMaxDiff = 7;
constexpr Int_t kMinSize = 20;

static Int_t px1, px2, py1, py2, pxl, pyl, pxt, pyt, pxold, pyold;
static Int_t px1p, px2p, py1p, py2p, pxlp, pylp, pxtp, pytp;
static Double_t oldX1, oldY1, oldX2, oldY2;
static Bool_t pA, pB, pC, pD, pTop, pL, pR, pBot, pINSIDE;
Int_t wx, wy;
auto parent = gPad;
auto pp = parent->GetPainter();
Bool_t opaque = gPad->OpaqueMoving();
Bool_t ropaque = gPad->OpaqueResizing();
Bool_t opaque = parent->OpaqueMoving();
Bool_t ropaque = parent->OpaqueResizing();

// convert to user coordinates and either paint ot set back
auto action = [parent,pp,isBox,this](Bool_t paint, Int_t _x1, Int_t _y1, Int_t _x2, Int_t _y2) {
auto action = [parent,isBox,this](Bool_t paint, Int_t _x1, Int_t _y1, Int_t _x2, Int_t _y2) {
auto x1 = parent->AbsPixeltoX(_x1);
auto y1 = parent->AbsPixeltoY(_y1);
auto x2 = parent->AbsPixeltoX(_x2);
Expand All @@ -268,6 +267,8 @@ void TBox::ExecuteEvent(Int_t event, Int_t px, Int_t py)
}
}
if (paint) {
auto pp = parent->GetPainter();
pp->SetAttLine({GetFillColor() > 0 ? GetFillColor() : (Color_t) 1, GetLineStyle(), 2});
pp->DrawBox(x1, y1, x2, y2, TVirtualPadPainter::kHollow);
} else {
SetX1(x1);
Expand Down Expand Up @@ -296,27 +297,15 @@ void TBox::ExecuteEvent(Int_t event, Int_t px, Int_t py)
oldY1 = fY1;
oldX2 = fX2;
oldY2 = fY2;
pp->SetAttLine({GetFillColor() > 0 ? GetFillColor() : (Color_t) 1, GetLineStyle(), 2});

// No break !!!

case kMouseMotion:

px1 = gPad->XtoAbsPixel(GetX1());
py1 = gPad->YtoAbsPixel(GetY1());
px2 = gPad->XtoAbsPixel(GetX2());
py2 = gPad->YtoAbsPixel(GetY2());

if (isBox) {
if (gPad->GetLogx()) {
if (GetX1() > 0) px1 = gPad->XtoAbsPixel(TMath::Log10(GetX1()));
if (GetX2() > 0) px2 = gPad->XtoAbsPixel(TMath::Log10(GetX2()));
}
if (gPad->GetLogy()) {
if (GetY1() > 0) py1 = gPad->YtoAbsPixel(TMath::Log10(GetY1()));
if (GetY2() > 0) py2 = gPad->YtoAbsPixel(TMath::Log10(GetY2()));
}
}
px1 = parent->XtoAbsPixel(isBox ? parent->XtoPad(GetX1()) : GetX1());
py1 = parent->YtoAbsPixel(isBox ? parent->YtoPad(GetY1()) : GetY1());
px2 = parent->XtoAbsPixel(isBox ? parent->XtoPad(GetX2()) : GetX2());
py2 = parent->YtoAbsPixel(isBox ? parent->YtoPad(GetY2()) : GetY2());

if (px1 < px2) {
pxl = px1;
Expand Down Expand Up @@ -355,64 +344,59 @@ void TBox::ExecuteEvent(Int_t event, Int_t px, Int_t py)

pA = pB = pC = pD = pTop = pL = pR = pBot = pINSIDE = kFALSE;

// case pA
// case pA
if (TMath::Abs(px - pxl) <= kMaxDiff && TMath::Abs(py - pyl) <= kMaxDiff) {
pxold = pxl; pyold = pyl; pA = kTRUE;
gPad->SetCursor(kTopLeft);
parent->SetCursor(kTopLeft);
}
// case pB
// case pB
if (TMath::Abs(px - pxt) <= kMaxDiff && TMath::Abs(py - pyl) <= kMaxDiff) {
pxold = pxt; pyold = pyl; pB = kTRUE;
gPad->SetCursor(kTopRight);
parent->SetCursor(kTopRight);
}
// case pC
// case pC
if (TMath::Abs(px - pxt) <= kMaxDiff && TMath::Abs(py - pyt) <= kMaxDiff) {
pxold = pxt; pyold = pyt; pC = kTRUE;
gPad->SetCursor(kBottomRight);
parent->SetCursor(kBottomRight);
}
// case pD
// case pD
if (TMath::Abs(px - pxl) <= kMaxDiff && TMath::Abs(py - pyt) <= kMaxDiff) {
pxold = pxl; pyold = pyt; pD = kTRUE;
gPad->SetCursor(kBottomLeft);
parent->SetCursor(kBottomLeft);
}

if ((px > pxl+kMaxDiff && px < pxt-kMaxDiff) &&
TMath::Abs(py - pyl) < kMaxDiff) { // top edge
// top edge
if ((px > pxl+kMaxDiff && px < pxt-kMaxDiff) && TMath::Abs(py - pyl) < kMaxDiff) {
pxold = pxl; pyold = pyl; pTop = kTRUE;
gPad->SetCursor(kTopSide);
parent->SetCursor(kTopSide);
}

if ((px > pxl+kMaxDiff && px < pxt-kMaxDiff) &&
TMath::Abs(py - pyt) < kMaxDiff) { // bottom edge
// bottom edge
if ((px > pxl+kMaxDiff && px < pxt-kMaxDiff) && TMath::Abs(py - pyt) < kMaxDiff) {
pxold = pxt; pyold = pyt; pBot = kTRUE;
gPad->SetCursor(kBottomSide);
parent->SetCursor(kBottomSide);
}

if ((py > pyl+kMaxDiff && py < pyt-kMaxDiff) &&
TMath::Abs(px - pxl) < kMaxDiff) { // left edge
// left edge
if ((py > pyl+kMaxDiff && py < pyt-kMaxDiff) && TMath::Abs(px - pxl) < kMaxDiff) {
pxold = pxl; pyold = pyl; pL = kTRUE;
gPad->SetCursor(kLeftSide);
parent->SetCursor(kLeftSide);
}

if ((py > pyl+kMaxDiff && py < pyt-kMaxDiff) &&
TMath::Abs(px - pxt) < kMaxDiff) { // right edge
// right edge
if ((py > pyl+kMaxDiff && py < pyt-kMaxDiff) && TMath::Abs(px - pxt) < kMaxDiff) {
pxold = pxt; pyold = pyt; pR = kTRUE;
gPad->SetCursor(kRightSide);
parent->SetCursor(kRightSide);
}

if ((px > pxl+kMaxDiff && px < pxt-kMaxDiff) &&
(py > pyl+kMaxDiff && py < pyt-kMaxDiff)) { // inside box
// inside box
if ((px > pxl+kMaxDiff && px < pxt-kMaxDiff) && (py > pyl+kMaxDiff && py < pyt-kMaxDiff)) {
pxold = px; pyold = py; pINSIDE = kTRUE;
if (event == kButton1Down)
gPad->SetCursor(kMove);
parent->SetCursor(kMove);
else
gPad->SetCursor(kCross);
parent->SetCursor(kCross);
}

fResizing = pA || pB || pC || pD || pTop || pL || pR || pBot;

if (!fResizing && !pINSIDE)
gPad->SetCursor(kCross);
parent->SetCursor(kCross);

break;

Expand Down Expand Up @@ -531,6 +515,8 @@ void TBox::ExecuteEvent(Int_t event, Int_t px, Int_t py)
case kButton1Up:
if (gROOT->IsEscaped()) {
gROOT->SetEscape(kFALSE);
if (opaque || ropaque)
parent->ShowGuidelines(this, event);
if (opaque) {
SetX1(oldX1);
SetY1(oldY1);
Expand Down Expand Up @@ -567,9 +553,6 @@ void TBox::ExecuteEvent(Int_t event, Int_t px, Int_t py)
if (pA || pB || pC || pD || pTop || pL || pR || pBot)
parent->Modified(kTRUE);

if (!opaque)
pp->SetAttLine({-1, 1, -1});

break;

case kButton1Locate:
Expand Down
1 change: 1 addition & 0 deletions graf2d/graf/src/TEllipse.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@ void TEllipse::ExecuteEvent(Int_t event, Int_t px, Int_t py)
if (gROOT->IsEscaped()) {
gROOT->SetEscape(kFALSE);
if (opaque) {
gPad->ShowGuidelines(this, event);
this->SetX1(oldX1);
this->SetY1(oldY1);
this->SetR1(oldR1);
Expand Down
Loading
Loading