From 7f8411f47fafb246b4aa6d075829437226dd5ce4 Mon Sep 17 00:00:00 2001
From: Collin Kidder <collink@kkmfg.com>
Date: Wed, 12 Feb 2020 21:16:02 -0500
Subject: [PATCH] Fixes to hopefully make signal colors look proper.

---
 dbc/dbchandler.cpp    | 4 ++--
 dbc/dbcmaineditor.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dbc/dbchandler.cpp b/dbc/dbchandler.cpp
index 4532372..d56d18b 100644
--- a/dbc/dbchandler.cpp
+++ b/dbc/dbchandler.cpp
@@ -1507,8 +1507,8 @@ DBCFile* DBCHandler::loadJSONFile(int idx)
              msg.sender = thisFile->findNodeByIdx(0);
              QString nodeName = iter->toObject().find("originNode").value().toString();
              msg.sender = thisFile->findNodeByName(nodeName);
-             msg.bgColor = QColor();
-             msg.fgColor = QColor();
+             msg.bgColor = QColor(thisFile->findAttributeByName("GenMsgBackgroundColor")->defaultValue.toString());
+             msg.fgColor = QColor(thisFile->findAttributeByName("GenMsgForegroundColor")->defaultValue.toString());
              if (!msg.sender && nodeName.length() > 1)
              {
                  DBC_NODE node;
diff --git a/dbc/dbcmaineditor.cpp b/dbc/dbcmaineditor.cpp
index aea0f9b..ccf9a1b 100644
--- a/dbc/dbcmaineditor.cpp
+++ b/dbc/dbcmaineditor.cpp
@@ -288,8 +288,8 @@ void DBCMainEditor::onCellChangedMessage(int row,int col)
             newMsg.name = "";
             newMsg.sender = node;
             newMsg.len = 0;
-            newMsg.fgColor = ui->MessagesTable->item(row, 4)->backgroundColor();
-            newMsg.bgColor = ui->MessagesTable->item(row, 5)->backgroundColor();
+            newMsg.fgColor = QColor(dbcFile->findAttributeByName("GenMsgForegroundColor")->defaultValue.toString());
+            newMsg.bgColor = QColor(dbcFile->findAttributeByName("GenMsgBackgroundColor")->defaultValue.toString());
 
             for (int i = 0; i < referenceFrames->length(); i++)
             {