From 716f40ab3a645d575f70771480417acb44adc4d6 Mon Sep 17 00:00:00 2001
From: Andreas Buhr <andreas@andreasbuhr.de>
Date: Fri, 30 Jul 2021 13:38:31 +0200
Subject: [PATCH] Some fixes around margins for Qt6

---
 src/Charts/UserChart.cpp   | 4 ++--
 src/Gui/GcWindowLayout.cpp | 3 ++-
 src/Gui/NewMainWindow.cpp  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Charts/UserChart.cpp b/src/Charts/UserChart.cpp
index 2d406c7c3..685d84728 100644
--- a/src/Charts/UserChart.cpp
+++ b/src/Charts/UserChart.cpp
@@ -1077,7 +1077,7 @@ EditUserSeriesDialog::EditUserSeriesDialog(Context *context, bool rangemode, Gen
 
     // set the dialog
     QVBoxLayout *main = new QVBoxLayout(this);
-    main->setMargin(10*dpiXFactor);
+    main->setContentsMargins(10*dpiXFactor,10*dpiXFactor,10*dpiXFactor,10*dpiXFactor);
     QHBoxLayout *hf = new QHBoxLayout();
     QVBoxLayout *pl = new QVBoxLayout();
     QFormLayout *cf = new QFormLayout();
@@ -1402,7 +1402,7 @@ EditUserAxisDialog::EditUserAxisDialog(Context *context, GenericAxisInfo &info)
 
     // set the dialog
     QVBoxLayout *main = new QVBoxLayout(this);
-    main->setMargin(10*dpiXFactor);
+    main->setContentsMargins(10*dpiXFactor,10*dpiXFactor,10*dpiXFactor,10*dpiXFactor);
     QFormLayout *cf = new QFormLayout();
     main->addLayout(cf);
     main->addStretch();
diff --git a/src/Gui/GcWindowLayout.cpp b/src/Gui/GcWindowLayout.cpp
index f0d376533..ffb90b8e1 100644
--- a/src/Gui/GcWindowLayout.cpp
+++ b/src/Gui/GcWindowLayout.cpp
@@ -119,7 +119,8 @@ QSize GcWindowLayout::minimumSize() const
     foreach (item, itemList)
         size = size.expandedTo(item->minimumSize());
 
-    size += QSize(2*margin(), 2*margin());
+    QMargins m = contentsMargins();
+    size += QSize(m.left()+m.right(), m.top()+m.bottom());
     return size;
 }
 
diff --git a/src/Gui/NewMainWindow.cpp b/src/Gui/NewMainWindow.cpp
index 0caa4d592..04bd9d7e8 100644
--- a/src/Gui/NewMainWindow.cpp
+++ b/src/Gui/NewMainWindow.cpp
@@ -33,7 +33,7 @@ NewMainWindow::NewMainWindow(QApplication *app) : QMainWindow(NULL), state(Inact
     setCentralWidget(main);
     layout = new QVBoxLayout(main);
     layout->setSpacing(0);
-    layout->setMargin(0);
+    layout->setContentsMargins(QMargins());
 
     // toolbar
     setupToolbar();