From e86fbd0689faf60f4478465005629e8c35471544 Mon Sep 17 00:00:00 2001
From: Syres916 <46537884+Syres916@users.noreply.github.com>
Date: Wed, 13 Aug 2025 12:34:25 +0100
Subject: [PATCH 1/3] [CAM] Fix SetupSheet form table minimum height to be
 300px

---
 src/Mod/CAM/Path/Base/Gui/SetupSheet.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Mod/CAM/Path/Base/Gui/SetupSheet.py b/src/Mod/CAM/Path/Base/Gui/SetupSheet.py
index 97d6e0084e..07eedad54f 100644
--- a/src/Mod/CAM/Path/Base/Gui/SetupSheet.py
+++ b/src/Mod/CAM/Path/Base/Gui/SetupSheet.py
@@ -183,6 +183,7 @@ class OpTaskPanel:
         self.form.table.setModel(self.model)
         self.form.table.setItemDelegateForColumn(2, self.delegate)
         self.form.table.resizeColumnsToContents()
+        self.form.table.setMinimumHeight(300)
 
         self.model.dataChanged.connect(self.updateData)
 

From 806e3e9eb0ce9266f73beccc322cbea531dc81b7 Mon Sep 17 00:00:00 2001
From: Syres916 <46537884+Syres916@users.noreply.github.com>
Date: Sun, 12 Oct 2025 18:41:05 +0100
Subject: [PATCH 2/3] [Gui] revert PR23067 and apply table height...

...directly in the Python code
---
 src/Gui/Stylesheets/FreeCAD Dark.qss  | 5 +++--
 src/Gui/Stylesheets/FreeCAD Light.qss | 5 +++--
 src/Gui/Stylesheets/FreeCAD.qss       | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Gui/Stylesheets/FreeCAD Dark.qss b/src/Gui/Stylesheets/FreeCAD Dark.qss
index 7187c83ee3..1fe521f19e 100644
--- a/src/Gui/Stylesheets/FreeCAD Dark.qss	
+++ b/src/Gui/Stylesheets/FreeCAD Dark.qss	
@@ -1684,10 +1684,11 @@ color: white;
 background-color: #252525;
 }
 
-/* Fix for tables inside task panels, see https://github.com/FreeCAD/FreeCAD/issues/22957 */
+/* Fix for tables inside task panels, see https://github.com/FreeCAD/FreeCAD/issues/22957 
+Reverted due to regression https://github.com/FreeCAD/FreeCAD/issues/24604
 QSint--ActionGroup QFrame[class="content"] QTableView {
   min-height: 300px;
-}
+} */
 
 /* found inside Part Design Workbench and "make a draft on a face" Task panel options */
 QSint--ActionGroup QFrame[class="content"] QToolButton {
diff --git a/src/Gui/Stylesheets/FreeCAD Light.qss b/src/Gui/Stylesheets/FreeCAD Light.qss
index e57b4a41d3..7baf85ac9e 100644
--- a/src/Gui/Stylesheets/FreeCAD Light.qss	
+++ b/src/Gui/Stylesheets/FreeCAD Light.qss	
@@ -1682,10 +1682,11 @@ color: black;
 background-color: #f0f0f0;
 }
 
-/* Fix for tables inside task panels, see https://github.com/FreeCAD/FreeCAD/issues/22957 */
+/* Fix for tables inside task panels, see https://github.com/FreeCAD/FreeCAD/issues/22957 
+Reverted due to regression https://github.com/FreeCAD/FreeCAD/issues/24604
 QSint--ActionGroup QFrame[class="content"] QTableView {
   min-height: 300px;
-}
+} */
 
 /* found inside Part Design Workbench and "make a draft on a face" Task panel options */
 QSint--ActionGroup QFrame[class="content"] QToolButton {
diff --git a/src/Gui/Stylesheets/FreeCAD.qss b/src/Gui/Stylesheets/FreeCAD.qss
index 347912309d..bb99904924 100644
--- a/src/Gui/Stylesheets/FreeCAD.qss
+++ b/src/Gui/Stylesheets/FreeCAD.qss
@@ -1575,10 +1575,11 @@ QSint--ActionGroup QFrame[class="content"] QTableView {
   background-color: @PrimaryColor;
 }
 
-/* Fix for tables inside task panels, see https://github.com/FreeCAD/FreeCAD/issues/22957 */
+/* Fix for tables inside task panels, see https://github.com/FreeCAD/FreeCAD/issues/22957 
+Reverted due to regression https://github.com/FreeCAD/FreeCAD/issues/24604
 QSint--ActionGroup QFrame[class="content"] QTableView {
   min-height: 300px;
-}
+} */
 
 /* found inside Part Design Workbench and "make a draft on a face" Task panel options */
 QSint--ActionGroup QFrame[class="content"] QToolButton {

From 36b263a906db082e95be2586f0385d5c7ce3c9a0 Mon Sep 17 00:00:00 2001
From: Syres916 <46537884+Syres916@users.noreply.github.com>
Date: Sat, 18 Oct 2025 11:26:50 +0100
Subject: [PATCH 3/3] [Gui] change global QPushbutton min-width from 64px to
 80px

---
 src/Gui/Stylesheets/FreeCAD.qss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Gui/Stylesheets/FreeCAD.qss b/src/Gui/Stylesheets/FreeCAD.qss
index bb99904924..c593229dc9 100644
--- a/src/Gui/Stylesheets/FreeCAD.qss
+++ b/src/Gui/Stylesheets/FreeCAD.qss
@@ -1178,7 +1178,7 @@ QPushButton {
   border: 1px solid @ButtonBorderColor;
   border-radius: @InputFieldBorderRadius;
   padding: 3px 12px;
-  min-width: 64px;
+  min-width: 80px; /* changed from 64px to fix issue  #24604 and align with setting from 1.0.x */
 }
 
 QPushButton:default {