From 46cfe6c19de13d9f94daeebd3bcb176af613e46d Mon Sep 17 00:00:00 2001
From: Sergey Linev <S.Linev@gsi.de>
Date: Tue, 12 May 2026 15:38:01 +0200
Subject: [PATCH 1/2] [glpainter] use GL_LINE_LOOP for box border

It is more direct usage of line drawings in GL instead of using `glRectd` with disabled polygon drawing
---
 graf3d/gl/src/TGLPadPainter.cxx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/graf3d/gl/src/TGLPadPainter.cxx b/graf3d/gl/src/TGLPadPainter.cxx
index e95feaa9d39b4..bb88b8b08611c 100644
--- a/graf3d/gl/src/TGLPadPainter.cxx
+++ b/graf3d/gl/src/TGLPadPainter.cxx
@@ -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);

From 3b081586ed1beded7cb4c97940a75e2833aead7e Mon Sep 17 00:00:00 2001
From: Sergey Linev <S.Linev@gsi.de>
Date: Tue, 12 May 2026 15:49:14 +0200
Subject: [PATCH 2/2] [quartz] fix maker size usage

Now attributes from GetAttMarker() must be always used.
Methods from TVirtualX interface is only for backward compatibility
---
 graf2d/cocoa/src/TGQuartz.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graf2d/cocoa/src/TGQuartz.mm b/graf2d/cocoa/src/TGQuartz.mm
index f60389eacbf52..cbebc472433bb 100644
--- a/graf2d/cocoa/src/TGQuartz.mm
+++ b/graf2d/cocoa/src/TGQuartz.mm
@@ -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);