From 9ea3c4746c421b0fae94a2011230dd9b1a0359e3 Mon Sep 17 00:00:00 2001
From: Collin Kidder <collink@kkmfg.com>
Date: Sun, 25 Dec 2022 18:16:49 -0500
Subject: [PATCH] Fix bitview in Signal Editor on MacOS

MacOS didn't scale the bitfield widget quite the way it was supposed to. The layout has been redesigned to prevent this issue.
---
 dbc/dbcsignaleditor.cpp |  4 +--
 ui/dbcsignaleditor.ui   | 73 ++++++++++++++++++-----------------------
 2 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/dbc/dbcsignaleditor.cpp b/dbc/dbcsignaleditor.cpp
index 80e309e..19050ce 100644
--- a/dbc/dbcsignaleditor.cpp
+++ b/dbc/dbcsignaleditor.cpp
@@ -470,7 +470,7 @@ void DBCSignalEditor::fillSignalForm(DBC_SIGNAL *sig)
     inhibitMsgProc = true;
 
     if (sig == nullptr) {
-        ui->groupBox->setEnabled(false);
+        //ui->groupBox->setEnabled(false);
         ui->txtName->setText("");
         ui->txtBias->setText("");
         ui->txtBitLength->setText("");
@@ -491,7 +491,7 @@ void DBCSignalEditor::fillSignalForm(DBC_SIGNAL *sig)
     }
 
     /* we have a signal */
-    ui->groupBox->setEnabled(true);
+    //ui->groupBox->setEnabled(true);
 
     ui->txtName->setText(sig->name);
     ui->txtBias->setText(QString::number(sig->bias));
diff --git a/ui/dbcsignaleditor.ui b/ui/dbcsignaleditor.ui
index 9905c6c..df055dd 100644
--- a/ui/dbcsignaleditor.ui
+++ b/ui/dbcsignaleditor.ui
@@ -17,46 +17,38 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout" stretch="2,1">
      <item>
-      <widget class="QGroupBox" name="groupBox">
-       <property name="title">
-        <string>Signal Parameters</string>
-       </property>
-       <layout class="QFormLayout" name="formLayout">
-        <item row="0" column="0">
-         <widget class="QLabel" name="label">
-          <property name="text">
-           <string>Name:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QLineEdit" name="txtName"/>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_3">
-          <property name="text">
-           <string>Start Bit:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="CANDataGrid" name="bitfield" native="true">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>300</width>
-            <height>300</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>Name:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="txtName"/>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="CANDataGrid" name="bitfield" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>300</width>
+           <height>300</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
       <layout class="QFormLayout" name="formLayout_2">
@@ -258,7 +250,6 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>txtName</tabstop>
   <tabstop>txtBitLength</tabstop>
   <tabstop>cbIntelFormat</tabstop>
   <tabstop>comboType</tabstop>