From 264d53cb39078e6b556cdea453771c292e7542c6 Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter@edelhirsch.io>
Date: Mon, 13 Jun 2022 17:18:47 +0200
Subject: [PATCH 1/2] QskMenu: Respect graphic padding (#196)

We need some padding for e.g. the Material 3 style.
---
 src/controls/QskMenuSkinlet.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/controls/QskMenuSkinlet.cpp b/src/controls/QskMenuSkinlet.cpp
index 12e8be86..d4e941b8 100644
--- a/src/controls/QskMenuSkinlet.cpp
+++ b/src/controls/QskMenuSkinlet.cpp
@@ -323,8 +323,10 @@ QRectF QskMenuSkinlet::sampleRect(
         {
             auto graphicRect = r;
             graphicRect.setWidth( graphicWidth );
+            const auto padding = menu->paddingHint( QskMenu::Graphic );
+            graphicRect = graphicRect.marginsRemoved( padding );
 
-            return QRectF( r.x(), r.y(), graphicWidth, r.height() );
+            return graphicRect;
         }
         else
         {

From 2a2894a63f83ee758534a15557c478b8e0f27087 Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Mon, 13 Jun 2022 20:34:12 +0200
Subject: [PATCH 2/2] lost workaround forsituations, where multisampling gets
 lost, fixed

---
 src/nodes/QskTextureRenderer.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/nodes/QskTextureRenderer.cpp b/src/nodes/QskTextureRenderer.cpp
index 908cc296..3bdf7a4a 100644
--- a/src/nodes/QskTextureRenderer.cpp
+++ b/src/nodes/QskTextureRenderer.cpp
@@ -158,6 +158,18 @@ quint32 QskTextureRenderer::createPaintedTextureGL(
 
         painter.scale( ratio, ratio );
         helper->paint( &painter, size / ratio );
+
+#if 1
+        if ( format1.samples() > 0 )
+        {
+            /*
+                Multisampling in the window surface might get lost
+                as a side effect of rendering to the FBO.
+                weired, needs to be investigated more
+             */
+            painter.setRenderHint( QPainter::Antialiasing, true );
+        }
+#endif
     }
 
     QOpenGLFramebufferObjectFormat format2;