Skip to content

[6.40] fix GL box painting, marker size in quartz #22262

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
dpiparo merged 2 commits into from
May 13, 2026
+7 −6
Merged

[6.40] fix GL box painting, marker size in quartz #22262

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
46cfe6c
[glpainter] use GL_LINE_LOOP for box border
linev May 12, 2026
3b08158
[quartz] fix maker size usage
linev May 12, 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
2 changes: 1 addition & 1 deletion graf2d/cocoa/src/TGQuartz.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ void ConvertPointsROOTToCocoa(Int_t nPoints, const TPoint *xy, std::vector<TPoin
CGContextSetLineCap(ctx, kCGLineCapRound);
}

Float_t MarkerSizeReduced = GetMarkerSize() - TMath::Floor(TAttMarker::GetMarkerLineWidth(attmark.GetMarkerStyle())/2.)/4.;
Float_t MarkerSizeReduced = attmark.GetMarkerSize() - TMath::Floor(TAttMarker::GetMarkerLineWidth(attmark.GetMarkerStyle())/2.)/4.;
Quartz::DrawPolyMarker(ctx, n, &fConvertedPoints[0], MarkerSizeReduced * drawable.fScaleFactor, markerstyle);

CGContextSetLineJoin(ctx, kCGLineJoinMiter);
Expand Down
11 changes: 6 additions & 5 deletions graf3d/gl/src/TGLPadPainter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,11 +457,12 @@ void TGLPadPainter::DrawBox(Double_t x1, Double_t y1, Double_t x2, Double_t y2,

if (mode == kHollow) {
const Rgl::Pad::LineAttribSet lineAttribs(kTRUE, 0, fLimits.GetMaxLineWidth(), kTRUE, &GetAttLine());
//
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
glRectd(x1, y1, x2, y2);
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
glLineWidth(1.f);
glBegin(GL_LINE_LOOP);
glVertex2d(x1, y1);
glVertex2d(x2, y1);
glVertex2d(x2, y2);
glVertex2d(x1, y2);
glEnd();
} else {
const Rgl::Pad::FillAttribSet fillAttribs(fSSet, kFALSE, &fGlFillAtt);//Set filling parameters.
glRectd(x1, y1, x2, y2);
Expand Down
Loading