From a114a6bf17877306df9a3fc98c3481a970c8558b Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Wed, 25 Jan 2023 08:14:08 +0800
Subject: [PATCH] cabana: improve layout (#27039)

improve layout
old-commit-hash: 81956649c8fad46beb6668009f2136b341260434
---
 tools/cabana/binaryview.cc   | 7 ++++++-
 tools/cabana/binaryview.h    | 1 +
 tools/cabana/detailwidget.cc | 1 -
 tools/cabana/detailwidget.h  | 1 +
 tools/cabana/mainwin.cc      | 1 -
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/cabana/binaryview.cc b/tools/cabana/binaryview.cc
index 84c2dd2a52..eaa33724e8 100644
--- a/tools/cabana/binaryview.cc
+++ b/tools/cabana/binaryview.cc
@@ -11,6 +11,7 @@
 // BinaryView
 
 const int CELL_HEIGHT = 36;
+const int VERTICAL_HEADER_WIDTH = 30;
 
 inline int get_bit_index(const QModelIndex &index, bool little_endian) {
   return index.row() * 8 + (little_endian ? 7 - index.column() : index.column());
@@ -33,6 +34,10 @@ BinaryView::BinaryView(QWidget *parent) : QTableView(parent) {
   setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 }
 
+QSize BinaryView::minimumSizeHint() const {
+  return {horizontalHeader()->minimumSectionSize() * 9 + VERTICAL_HEADER_WIDTH + 2, 0};
+}
+
 void BinaryView::highlight(const Signal *sig) {
   if (sig != hovered_sig) {
     hovered_sig = sig;
@@ -215,7 +220,7 @@ QVariant BinaryViewModel::headerData(int section, Qt::Orientation orientation, i
   if (orientation == Qt::Vertical) {
     switch (role) {
       case Qt::DisplayRole: return section;
-      case Qt::SizeHintRole: return QSize(30, 0);
+      case Qt::SizeHintRole: return QSize(VERTICAL_HEADER_WIDTH, 0);
       case Qt::TextAlignmentRole: return Qt::AlignCenter;
     }
   }
diff --git a/tools/cabana/binaryview.h b/tools/cabana/binaryview.h
index e936efc658..55de71572e 100644
--- a/tools/cabana/binaryview.h
+++ b/tools/cabana/binaryview.h
@@ -60,6 +60,7 @@ public:
   void highlight(const Signal *sig);
   QSet<const Signal*> getOverlappingSignals() const;
   inline void updateState() { model->updateState(); }
+  QSize minimumSizeHint() const override;
 
 signals:
   void signalClicked(const Signal *sig);
diff --git a/tools/cabana/detailwidget.cc b/tools/cabana/detailwidget.cc
index 78e5a6a6f6..7f59087643 100644
--- a/tools/cabana/detailwidget.cc
+++ b/tools/cabana/detailwidget.cc
@@ -16,7 +16,6 @@
 
 DetailWidget::DetailWidget(ChartsWidget *charts, QWidget *parent) : charts(charts), QWidget(parent) {
   undo_stack = new QUndoStack(this);
-  setMinimumWidth(500);
   QWidget *main_widget = new QWidget(this);
   QVBoxLayout *main_layout = new QVBoxLayout(main_widget);
   main_layout->setContentsMargins(0, 0, 0, 0);
diff --git a/tools/cabana/detailwidget.h b/tools/cabana/detailwidget.h
index 18c58ab6bf..b07629084a 100644
--- a/tools/cabana/detailwidget.h
+++ b/tools/cabana/detailwidget.h
@@ -31,6 +31,7 @@ public:
   DetailWidget(ChartsWidget *charts, QWidget *parent);
   void setMessage(const QString &message_id);
   void dbcMsgChanged(int show_form_idx = -1);
+  QSize minimumSizeHint() const override { return binary_view->minimumSizeHint(); }
   QUndoStack *undo_stack = nullptr;
 
 private:
diff --git a/tools/cabana/mainwin.cc b/tools/cabana/mainwin.cc
index e49148160d..bd32cfdfcc 100644
--- a/tools/cabana/mainwin.cc
+++ b/tools/cabana/mainwin.cc
@@ -24,7 +24,6 @@ void qLogMessageHandler(QtMsgType type, const QMessageLogContext &context, const
 MainWindow::MainWindow() : QMainWindow() {
   createDockWindows();
   detail_widget = new DetailWidget(charts_widget, this);
-  detail_widget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
   setCentralWidget(detail_widget);
   createActions();
   createStatusBar();