Integrating up through commit 90f050496

This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -27,8 +27,10 @@ namespace AtomToolsFramework
{
AzQtComponents::Text::addPrimaryStyle(this);
AzQtComponents::Text::addLabelStyle(this);
setStyleSheet("background-color: rgb(35, 35, 35)");
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
setStyleSheet("background-color: #333333; border-style: solid; border-color: #1B1B1B; border-width: 1px; border-left: none; border-right: none;");
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
setFixedHeight(24);
setMargin(0);
}
void InspectorGroupHeaderWidget::SetExpanded(bool expanded)
@@ -36,8 +36,7 @@ namespace AtomToolsFramework
{
qDeleteAll(m_ui->m_propertyContent->children());
m_layout = new QVBoxLayout(m_ui->m_propertyContent);
// 5 pixels added on the right to fix occlusion by the scrollbar. Remove after switching to UI 2.0.
m_layout->setContentsMargins(0, 0, 5, 0);
m_layout->setContentsMargins(0, 0, 0, 0);
m_layout->setSpacing(0);
}