Merge pull request #24734 from Syres916/CAM_Fix_SetupSheet_Table_MinHeight
[Gui] fix Arch Grid QTableview height and buttons width...
This commit is contained in:
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -1174,7 +1174,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 {
|
||||
@@ -1571,10 +1571,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 {
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user