replace hardcoded margins, colors, spacing

Author: deanlee

tools/cabana/binaryview.cc

@@ -375,7 +375,7 @@ void BinaryItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
         bg.setAlpha(std::max(50, bg.alpha()));
       }
       painter->fillRect(option.rect, bg);
-      painter->setPen(Qt::black);
+      painter->setPen(option.palette.color(QPalette::Text));
     }
   }
 

tools/cabana/chartswidget.cc

@@ -25,11 +25,12 @@ ChartsWidget::ChartsWidget(QWidget *parent) : QFrame(parent) {
 
   // toolbar
   QToolBar *toolbar = new QToolBar(tr("Charts"), this);
-  toolbar->setIconSize({16, 16});
+  int icon_size = style()->pixelMetric(QStyle::PM_SmallIconSize);
+  toolbar->setIconSize({icon_size, icon_size});
 
   QAction *new_plot_btn = toolbar->addAction(utils::icon("file-plus"), tr("New Plot"));
   toolbar->addWidget(title_label = new QLabel());
-  title_label->setContentsMargins(0, 0, 12, 0);
+  title_label->setContentsMargins(0, 0, style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing), 0);
 
   QMenu *menu = new QMenu(this);
   for (int i = 0; i < MAX_COLUMN_COUNT; ++i) {
@@ -77,8 +78,8 @@ ChartsWidget::ChartsWidget(QWidget *parent) : QFrame(parent) {
   main_layout->addWidget(charts_scroll);
 
   // init settings
-  use_dark_theme = QApplication::style()->standardPalette().color(QPalette::WindowText).value() >
-                   QApplication::style()->standardPalette().color(QPalette::Background).value();
+  use_dark_theme = QApplication::palette().color(QPalette::WindowText).value() >
+                   QApplication::palette().color(QPalette::Background).value();
   column_count = std::clamp(settings.chart_column_count, 1, MAX_COLUMN_COUNT);
   max_chart_range = std::clamp(settings.chart_range, 1, settings.max_cached_minutes * 60);
   display_range = {0, max_chart_range};
@@ -322,7 +323,7 @@ ChartView::ChartView(QWidget *parent) : QChartView(nullptr, parent) {
   chart->setMargins({0, 0, 0, 0});
 
   background = new QGraphicsRectItem(chart);
-  background->setBrush(Qt::white);
+  background->setBrush(QApplication::palette().color(QPalette::Base));
   background->setPen(Qt::NoPen);
   background->setZValue(chart->zValue() - 1);
 
@@ -443,10 +444,12 @@ void ChartView::manageSeries() {
 
 void ChartView::resizeEvent(QResizeEvent *event) {
   updatePlotArea(align_to);
-  int x = event->size().width() - close_btn_proxy->size().width() - 11;
-  close_btn_proxy->setPos(x, 8);
-  manage_btn_proxy->setPos(x - manage_btn_proxy->size().width() - 5, 8);
-  move_icon->setPos(11, 8);
+  int top_margin = style()->pixelMetric(QStyle::PM_LayoutTopMargin);
+  int spacing = style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing);
+  int x = event->size().width() - close_btn_proxy->size().width() - style()->pixelMetric(QStyle::PM_LayoutRightMargin);
+  close_btn_proxy->setPos(x, top_margin);
+  manage_btn_proxy->setPos(x - manage_btn_proxy->size().width() - spacing, top_margin);
+  move_icon->setPos(style()->pixelMetric(QStyle::PM_LayoutLeftMargin), top_margin);
   QChartView::resizeEvent(event);
 }
 

tools/cabana/mainwin.cc

@@ -58,6 +58,11 @@ MainWindow::MainWindow() : QMainWindow() {
     fingerprint_to_dbc = QJsonDocument::fromJson(json_file.readAll());
   }
 
+  setStyleSheet(QString(R"(QMainWindow::separator {
+    width: %1px; /* when vertical */
+    height: %1px; /* when horizontal */
+  })").arg(style()->pixelMetric(QStyle::PM_SplitterWidth)));
+
   QObject::connect(this, &MainWindow::showMessage, statusBar(), &QStatusBar::showMessage);
   QObject::connect(this, &MainWindow::updateProgressBar, this, &MainWindow::updateDownloadProgress);
   QObject::connect(messages_widget, &MessagesWidget::msgSelectionChanged, center_widget, &CenterWidget::setMessage);

tools/cabana/signaledit.cc

@@ -322,19 +322,22 @@ void SignalItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
 
     // color label
     auto bg_color = getColor(item->sig);
-    QRect rc{option.rect.left(), option.rect.top(), color_label_width, option.rect.height()};
+    int h_margin = option.widget->style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1;
+    int v_margin = option.widget->style()->pixelMetric(QStyle::PM_FocusFrameVMargin);
+    QRect rc{option.rect.left() + h_margin, option.rect.top(), color_label_width, option.rect.height()};
     painter->setPen(Qt::NoPen);
     painter->setBrush(item->highlight ? bg_color.darker(125) : bg_color);
-    painter->drawRoundedRect(rc.adjusted(0, 2, 0, -2), 3, 3);
+    painter->drawRoundedRect(rc.adjusted(0, v_margin, 0, -v_margin), 3, 3);
     painter->setPen(item->highlight ? Qt::white : Qt::black);
     painter->setFont(small_font);
     painter->drawText(rc, Qt::AlignCenter, QString::number(item->row() + 1));
 
     // signal name
     painter->setFont(option.font);
-    painter->setPen((option.state & QStyle::State_Selected ? option.palette.highlightedText() : option.palette.text()).color());
+    painter->setPen(option.palette.color(option.state & QStyle::State_Selected ? QPalette::HighlightedText : QPalette::Text));
     QString text = index.data(Qt::DisplayRole).toString();
-    QRect text_rect = option.rect.adjusted(rc.width() + 6, 0, 0, 0);
+    QRect text_rect = option.rect;
+    text_rect.setLeft(rc.right() + h_margin * 2);
     text = painter->fontMetrics().elidedText(text, Qt::ElideRight, text_rect.width());
     painter->drawText(text_rect, option.displayAlignment, text);
     painter->restore();
@@ -343,7 +346,7 @@ void SignalItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
     if (option.state & QStyle::State_Selected) {
       painter->fillRect(option.rect, option.palette.highlight());
     }
-    painter->setPen((option.state & QStyle::State_Selected ? option.palette.highlightedText() : option.palette.text()).color());
+    painter->setPen(option.palette.color(option.state & QStyle::State_Selected ? QPalette::HighlightedText : QPalette::Text));
     QRect rc = option.rect.adjusted(0, 0, -70, 0);
     auto text = painter->fontMetrics().elidedText(index.data(Qt::DisplayRole).toString(), Qt::ElideRight, rc.width());
     painter->drawText(rc, Qt::AlignRight | Qt::AlignVCenter, text);
@@ -442,8 +445,11 @@ void SignalView::rowsChanged() {
     if (!tree->indexWidget(index)) {
       QWidget *w = new QWidget(this);
       QHBoxLayout *h = new QHBoxLayout(w);
-      h->setContentsMargins(0, 2, 0, 2);
-      h->addStretch(1);
+      int v_margin = style()->pixelMetric(QStyle::PM_FocusFrameVMargin);
+      int h_margin = style()->pixelMetric(QStyle::PM_FocusFrameHMargin);
+      h->setContentsMargins(0, v_margin, -h_margin, v_margin);
+      h->setSpacing(style()->pixelMetric(QStyle::PM_ToolBarItemSpacing));
+      h->addStretch(0);
 
       auto remove_btn = toolButton("x", tr("Remove signal"));
       auto plot_btn = toolButton("graph-up", "");

tools/cabana/util.cc

@@ -114,8 +114,8 @@ QValidator::State NameValidator::validate(QString &input, int &pos) const {
 
 namespace utils {
 QPixmap icon(const QString &id) {
-  static bool dark_theme = QApplication::style()->standardPalette().color(QPalette::WindowText).value() >
-                           QApplication::style()->standardPalette().color(QPalette::Background).value();
+  static bool dark_theme = QApplication::palette().color(QPalette::WindowText).value() >
+                           QApplication::palette().color(QPalette::Background).value();
   QPixmap pm;
   QString key = "bootstrap_" % id % (dark_theme ? "1" : "0");
   if (!QPixmapCache::find(key, &pm)) {