From 6cfb2e9ab1e49ca2835bb2132072259a1312385b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 10 Feb 2022 08:31:24 +0530
Subject: [PATCH] Fix #1960438 [[Enhancement] Windows have more top padding
 than others](https://bugs.launchpad.net/calibre/+bug/1960438)

---
 src/calibre/gui2/convert/bulk.py           |  1 +
 src/calibre/gui2/convert/heuristics.ui     | 13 +++++++++++++
 src/calibre/gui2/convert/single.py         |  1 +
 src/calibre/gui2/preferences/conversion.py |  1 +
 4 files changed, 16 insertions(+)

diff --git a/src/calibre/gui2/convert/bulk.py b/src/calibre/gui2/convert/bulk.py
index 520def5b6b..6496f460aa 100644
--- a/src/calibre/gui2/convert/bulk.py
+++ b/src/calibre/gui2/convert/bulk.py
@@ -105,6 +105,7 @@ class BulkConfig(Config):
         for w in widgets:
             w.set_help_signal.connect(self.help.setPlainText)
             w.setVisible(False)
+            w.layout().setContentsMargins(0, 0, 0, 0)
 
         self._groups_model = GroupModel(widgets)
         self.groups.setModel(self._groups_model)
diff --git a/src/calibre/gui2/convert/heuristics.ui b/src/calibre/gui2/convert/heuristics.ui
index 2d7cae9b60..ea65fc2f5b 100644
--- a/src/calibre/gui2/convert/heuristics.ui
+++ b/src/calibre/gui2/convert/heuristics.ui
@@ -213,6 +213,19 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/calibre/gui2/convert/single.py b/src/calibre/gui2/convert/single.py
index 4f27cce81f..1be8860d42 100644
--- a/src/calibre/gui2/convert/single.py
+++ b/src/calibre/gui2/convert/single.py
@@ -240,6 +240,7 @@ class Config(QDialog):
         for w in widgets:
             w.set_help_signal.connect(self.help.setPlainText)
             w.setVisible(False)
+            w.layout().setContentsMargins(0, 0, 0, 0)
 
         self._groups_model = GroupModel(widgets)
         self.groups.setModel(self._groups_model)
diff --git a/src/calibre/gui2/preferences/conversion.py b/src/calibre/gui2/preferences/conversion.py
index 4282ef7bf2..e056f67426 100644
--- a/src/calibre/gui2/preferences/conversion.py
+++ b/src/calibre/gui2/preferences/conversion.py
@@ -101,6 +101,7 @@ class Base(ConfigWidgetBase):
 
         for w in widgets:
             w.changed_signal.connect(self.changed_signal)
+            w.layout().setContentsMargins(6, 6, 6, 6)
             sa = QScrollArea(self)
             sa.setWidget(w)
             sa.setWidgetResizable(True)