From 995e3fee8562a968cc4c233a7e429d2121b1203f Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Mon, 14 Jul 2025 21:29:53 +0200
Subject: [PATCH] Fixed hardcoded background color

---
 .../src/gui/settings/RSPermissionMatrixWidget.cpp | 15 +++++++++++----
 .../src/gui/settings/RSPermissionMatrixWidget.h   |  2 ++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp
index 76622625b..671fed49f 100644
--- a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp
+++ b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp
@@ -32,6 +32,7 @@
 
 #include "RSPermissionMatrixWidget.h"
 #include "gui/settings/ServicePermissionsPage.h"
+#include "gui/settings/rsharesettings.h"
 #include <retroshare/rsstatus.h>
 #include <retroshare/rspeers.h>
 #include <retroshare/rsservicecontrol.h>
@@ -246,8 +247,14 @@ void RSPermissionMatrixWidget::paintEvent(QPaintEvent *)
   _painter->setRenderHint(QPainter::TextAntialiasing);
 
   /* Fill in the background */
-  _painter->fillRect(_rec, QBrush(BACK_COLOR));
+  //_painter->fillRect(_rec, QBrush(BACK_COLOR));
   _painter->drawRect(_rec);
+ 
+  if (Settings->getSheetName() == ":Standard_Dark"){
+    brushColor = Qt::gray ;
+  } else {
+    brushColor = Qt::black ;
+  }
 
   // draw one line per friend.
   std::list<RsPeerId> ssllist ;
@@ -306,7 +313,7 @@ void RSPermissionMatrixWidget::paintEvent(QPaintEvent *)
 
   QPen pen ;
   pen.setWidth(2) ;
-  pen.setBrush(FOREGROUND_COLOR) ;
+  pen.setBrush(brushColor) ;
 
   _painter->setPen(pen) ;
   int i=0;
@@ -371,7 +378,7 @@ void RSPermissionMatrixWidget::paintEvent(QPaintEvent *)
       _painter->drawLine(QPointF(X,Y+3),QPointF(X+text_width,Y+3)) ;
       _painter->drawLine(QPointF(X+text_width/2, Y+3), QPointF(X+text_width/2,S*fMATRIX_START_Y+peer_ids.size()*S*fROW_SIZE - S*fROW_SIZE+5)) ;
 
-      pen.setBrush(FOREGROUND_COLOR) ;
+      pen.setBrush(brushColor) ;
       _painter->setPen(pen) ;
 
       _painter->drawText(QPointF(X,Y),name);
@@ -553,7 +560,7 @@ void RSPermissionMatrixWidget::paintEvent(QPaintEvent *)
 				brush.setStyle(Qt::SolidPattern) ;
 				QPen pen ;
 				pen.setWidth(1) ;
-				pen.setBrush(FOREGROUND_COLOR) ;
+				pen.setBrush(brushColor) ;
 				_painter->setPen(pen) ;
 				QRect position = computeNodePosition(0,i,false) ;
 				int popup_x = position.x() + (50 * S / 14.0);
diff --git a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h
index ffc9a32b0..33aee43f8 100644
--- a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h
+++ b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h
@@ -26,6 +26,7 @@
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QFrame>
+#include <QColor>
 
 #include <stdint.h>
 #include <retroshare/rspeers.h>
@@ -103,6 +104,7 @@ private:
 
     /** The current dimensions of the graph. */
     QRect _rec;
+    QColor brushColor;
 
     bool mHideOffline;