diff --git a/src/Gui/GeometrySpreadsheetPanel/GeometrySpreadsheetMenuBar.cpp b/src/Gui/GeometrySpreadsheetPanel/GeometrySpreadsheetMenuBar.cpp index 24e05ab..0b6fe82 100644 --- a/src/Gui/GeometrySpreadsheetPanel/GeometrySpreadsheetMenuBar.cpp +++ b/src/Gui/GeometrySpreadsheetPanel/GeometrySpreadsheetMenuBar.cpp @@ -81,6 +81,9 @@ GeoSheetMenuBarModeSelection::GeoSheetMenuBarModeSelection(QWidget *parent, Qt:: : QWidget(parent, f) { mainLayout_ = new QHBoxLayout(); + constexpr int mainMargin = 0; + mainLayout_->setContentsMargins(mainMargin,mainMargin,mainMargin,mainMargin); + QWidget* buttonBg = new QWidget(); buttonBg->setObjectName("GeoSheetMenuBarButtonBg"); buttonBg->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); @@ -90,7 +93,7 @@ GeoSheetMenuBarModeSelection::GeoSheetMenuBarModeSelection(QWidget *parent, Qt:: R"( #GeoSheetMenuBarButtonBg { - background-color: #383838; + background-color: #242424; border-radius: 8px; } @@ -131,12 +134,22 @@ GeometrySpreadsheetMenuBar::GeometrySpreadsheetMenuBar(QWidget *parent, Qt::Wind { mainLayout_ = new QHBoxLayout(); nodeLabel_ = new QLabel(); - mainLayout_->addWidget(nodeLabel_); modeSelection = new GeoSheetMenuBarModeSelection(); + + mainLayout_->addWidget(nodeLabel_); mainLayout_->addStretch(); mainLayout_->addWidget(modeSelection); + setProperty("class", "GeometrySpreadsheetMenuBar"); + setStyleSheet( + R"( + .GeometrySpreadsheetMenuBar, + .GeometrySpreadsheetMenuBar * + { + background-color: #1B1B1B; + } + )"); - const int margins = 0; + constexpr int margins = 5; mainLayout_->setContentsMargins(margins, margins, margins, margins); setLayout(mainLayout_); @@ -145,5 +158,5 @@ GeometrySpreadsheetMenuBar::GeometrySpreadsheetMenuBar(QWidget *parent, Qt::Wind void GeometrySpreadsheetMenuBar::setNode(enzo::nt::OpId opId) { enzo::nt::GeometryOperator& geoOp = enzo::nt::nm().getGeoOperator(opId); - nodeLabel_->setText("Node: " + QString::fromStdString(geoOp.getLabel())); + nodeLabel_->setText("Node: " + QString::fromStdString(geoOp.getLabel())); } diff --git a/src/Gui/GeometrySpreadsheetPanel/GeometrySpreadsheetModel.cpp b/src/Gui/GeometrySpreadsheetPanel/GeometrySpreadsheetModel.cpp index 94318e6..2e87189 100644 --- a/src/Gui/GeometrySpreadsheetPanel/GeometrySpreadsheetModel.cpp +++ b/src/Gui/GeometrySpreadsheetPanel/GeometrySpreadsheetModel.cpp @@ -5,8 +5,10 @@ #include "Engine/Types.h" #include #include +#include #include #include +#include GeometrySpreadsheetModel::GeometrySpreadsheetModel(QObject *parent) @@ -111,7 +113,12 @@ QVariant GeometrySpreadsheetModel::data(const QModelIndex &index, int role) cons // return QVariant(); // } - if (role == Qt::DisplayRole) + if(role == Qt::BackgroundRole && index.column()==0) + { + return QBrush("#1B1B1B"); + + } + else if (role == Qt::DisplayRole) { if(index.column()==0) diff --git a/src/Gui/GeometrySpreadsheetPanel/GeometrySpreadsheetPanel.cpp b/src/Gui/GeometrySpreadsheetPanel/GeometrySpreadsheetPanel.cpp index 9aea7f7..5377c3c 100644 --- a/src/Gui/GeometrySpreadsheetPanel/GeometrySpreadsheetPanel.cpp +++ b/src/Gui/GeometrySpreadsheetPanel/GeometrySpreadsheetPanel.cpp @@ -14,17 +14,42 @@ GeometrySpreadsheetPanel::GeometrySpreadsheetPanel(QWidget *parent, Qt::WindowFl : QWidget(parent, f) { mainLayout_ = new QVBoxLayout(); + mainLayout_->setSpacing(0); view_ = new QTreeView(parent); view_->setRootIsDecorated(false); view_->setAlternatingRowColors(true); + view_->setUniformRowHeights(true); // improves performance view_->setStyleSheet(R"( QTreeView { background-color: #282828; alternate-background-color: #242424; paint-alternating-row-colors-for-empty-area: 1; } + QTreeView QScrollBar { + background: #1B1B1B; + width: 15px; + } + QTreeView QScrollBar::handle:vertical { + background: #282828; + min-height: 50px; + border-radius: 5px; + border-width: 1px; + border-color: #2D2D2D; + border-style: solid; + margin:2px; + } + + QTreeView QScrollBar::add-page:vertical, + QTreeView QScrollBar::sub-page:vertical, + QTreeView QScrollBar::add-line:vertical, + QTreeView QScrollBar::sub-line:vertical + { height: 0px; } + + QHeaderView::section { + background-color: #1B1B1B; + } )"); view_->setFrameStyle(QFrame::NoFrame); diff --git a/src/Gui/Interface.cpp b/src/Gui/Interface.cpp index cdc8c6f..16381ad 100644 --- a/src/Gui/Interface.cpp +++ b/src/Gui/Interface.cpp @@ -53,7 +53,7 @@ EnzoUI::EnzoUI() viewportSplitter_->addWidget(spreadsheetSplitter_); viewportSplitter_->addWidget(networkSplitter_); - viewportSplitter_->setSizes({100,300}); + viewportSplitter_->setSizes({100,200}); networkSplitter_->addWidget(parametersPanel); networkSplitter_->addWidget(network);