Fix double ScrollArea in config dialog

un-pogaz · Sep 8, 2023 · 32a2361 · 32a2361
1 parent 73e6238
commit 32a2361
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/changelog.md b/changelog.md
@@ -3,7 +3,7 @@
 ## [1.11.0] - date
 
 ### Changed
-- Update common_utils
+- Fix double ScrollArea in config dialog
 
 ## [1.10.0] - 2023/04/10
 

diff --git a/config.py b/config.py
@@ -165,23 +165,23 @@ def __init__(self, plugin_action):
         QWidget.__init__(self)
 
         self.plugin_action = plugin_action
-        layout = QVBoxLayout(self)
+        layout = QVBoxLayout()
         self.setLayout(layout)
 
+        if calibre_version < (6,26,0):
+            # Make dialog box scrollable (for smaller screens)
+            scrollable = QScrollArea()
+            scrollcontent = QWidget()
+            scrollable.setWidget(scrollcontent)
+            scrollable.setWidgetResizable(True)
+            layout.addWidget(scrollable)
+
+            layout = QVBoxLayout()
+            scrollcontent.setLayout(layout)
+
         title_layout = ImageTitleLayout(self, PLUGIN_ICON, _('Comments Cleaner Options'))
         layout.addLayout(title_layout)
 
-        # Make dialog box scrollable (for smaller screens)
-        scrollable = QScrollArea()
-        scrollcontent = QWidget()
-        scrollable.setWidget(scrollcontent)
-        scrollable.setWidgetResizable(True)
-        layout.addWidget(scrollable)
-
-        layout = QVBoxLayout()
-        scrollcontent.setLayout(layout)
-
-
         # --- options HTML ---
         optionsHTML_GroupBox = QGroupBox(' ', self)
         layout.addWidget(optionsHTML_GroupBox)