mirror of
https://github.com/sunnypilot/sunnypilot.git
synced 2026-09-30 17:03:41 +08:00
Merge branch 'master' into visual-style
This commit is contained in:
@@ -545,10 +545,8 @@ public:
|
|||||||
main_layout->removeWidget(title_label);
|
main_layout->removeWidget(title_label);
|
||||||
hlayout->addWidget(title_label, 1);
|
hlayout->addWidget(title_label, 1);
|
||||||
}
|
}
|
||||||
if (spacingItem != nullptr && main_layout->indexOf(spacingItem) != -1) {
|
main_layout->removeItem(spacingItem);
|
||||||
main_layout->removeItem(spacingItem);
|
spacingItem = nullptr;
|
||||||
spacingItem = nullptr;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
label.setStyleSheet(label_enabled_style);
|
label.setStyleSheet(label_enabled_style);
|
||||||
|
|||||||
@@ -14,10 +14,10 @@ ExpandableToggleRow::ExpandableToggleRow(const QString ¶m, const QString &ti
|
|||||||
QObject::connect(this, &ExpandableToggleRow::toggleFlipped, this, &ExpandableToggleRow::toggleClicked);
|
QObject::connect(this, &ExpandableToggleRow::toggleFlipped, this, &ExpandableToggleRow::toggleClicked);
|
||||||
|
|
||||||
collapsibleWidget = new QFrame(this);
|
collapsibleWidget = new QFrame(this);
|
||||||
collapsibleWidget->setContentsMargins(0, 0, 0, 0);
|
|
||||||
collapsibleWidget->setVisible(false);
|
collapsibleWidget->setVisible(false);
|
||||||
QVBoxLayout *collapsible_layout = new QVBoxLayout();
|
QVBoxLayout *collapsible_layout = new QVBoxLayout();
|
||||||
collapsibleWidget->setLayout(collapsible_layout);
|
collapsibleWidget->setLayout(collapsible_layout);
|
||||||
|
collapsible_layout->setContentsMargins(0, 0, 0, 0);
|
||||||
|
|
||||||
list = new ListWidgetSP(this, false);
|
list = new ListWidgetSP(this, false);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user