kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: Remove unnecessary scrollbars from Preferences

Browse Source
This commit is contained in:
Kacper Donat
2024-07-27 23:32:44 +02:00
parent 5326173c5f
commit 58e7b4ec99
3 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Gui/DlgPreferencesImp.cpp
View File

@@ -287,9 +287,19 @@ PreferencePage* DlgPreferencesImp::createPreferencePage(const std::string& pageN
return nullptr;
}
auto resetMargins = [](QWidget* widget) {
widget->setContentsMargins(0, 0, 0, 0);
widget->layout()->setContentsMargins(0, 0, 0, 0);
};
// settings layout already takes care for margins, we need to reset everything to 0
page->setContentsMargins(0, 0, 0, 0);
page->layout()->setContentsMargins(0, 0, 0, 0);
resetMargins(page);
// special handling for PreferenceUiForm to reset margins for forms too
if (auto uiFormPage = qobject_cast<PreferenceUiForm*>(page)) {
resetMargins(uiFormPage->form());
}
page->setProperty(GroupNameProperty, QString::fromStdString(groupName));
page->setProperty(PageNameProperty, QString::fromStdString(pageName));
@@ -352,15 +362,20 @@ int DlgPreferencesImp::minimumPageWidth() const
int DlgPreferencesImp::minimumDialogWidth(int pageWidth) const
{
// this is additional safety spacing to ensure that everything fits with scrollbar etc.
const auto additionalMargin = style()->pixelMetric(QStyle::PM_ScrollBarExtent) + 8;
QSize size = ui->groupWidgetStack->sizeHint();
int diff = pageWidth - size.width();
int dw = width();
if (diff > 0) {
const int offset = 2;
dw += diff + offset;
}
return dw;
return dw + additionalMargin;
}
void DlgPreferencesImp::updatePageDependentWidgets()