From fccb75e3642723a01cfe293c5b17f710b1e7a23c Mon Sep 17 00:00:00 2001
From: MisterMaker <marijn82@gmail.com>
Date: Mon, 6 Jan 2025 17:55:13 +0100
Subject: [PATCH] Stylesheets spreadsheets visual fix. (#18719)

* this fixes the spreadsheet alignment and the corner button

* missed a line
---
 src/Gui/Stylesheets/FreeCAD Dark.qss  | 45 ++++++++++++++-------------
 src/Gui/Stylesheets/FreeCAD Light.qss | 42 +++++++++++++------------
 2 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/src/Gui/Stylesheets/FreeCAD Dark.qss b/src/Gui/Stylesheets/FreeCAD Dark.qss
index 43f01a0f4e..9bb910ffcb 100644
--- a/src/Gui/Stylesheets/FreeCAD Dark.qss	
+++ b/src/Gui/Stylesheets/FreeCAD Dark.qss	
@@ -2366,49 +2366,45 @@ QColumnView::item:!selected:hover {
   background-color: @ThemeAccentColor1;
 }
 
-QTableCornerButton::section {
-  background-color: #444444;
-  border: 1px transparent #020202;
-  border-radius: 0px;
-}
-
 QTableView::item {
     color: white;
 }
-QTableView {
-  /*qproperty-AliasedCellBackgroundColor: #f700ff;*/
-  /*qproperty-aliasBgColor: #f700ff;*/
-}
 
 /* QHeaderView ------------------------------------------------------------
 
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qheaderview
 
 --------------------------------------------------------------------------- */
+
+QTableCornerButton::section {
+  background-color: #333333;
+  border-radius: 0px; /*if you remove this line it breaks it*/
+  border-bottom: 1px solid #020202;
+  border-right: 1px solid #020202;
+  border-top: 0px solid #020202;
+  border-left: 0px solid #020202;
+}
+
 QHeaderView {
   background-color: transparent;
-  /* text-align: bottom; */
+  margin: -1px; /* fix for misalignement*/
 }
 
 QHeaderView:disabled {
-  /* background-color: #444444; */
   color: #adadad;
 }
 
 QHeaderView::section {
   background-color: qlineargradient(x1:0, y1:0.3, x2:0, y2:1, stop:0 #333333, stop:1 #252525);
-  color: white;
-  border-bottom: 1px solid #020202;
-  border-right: 1px solid #020202;
-  border-top: 1px solid #020202;
-  border-left: 1px solid transparent;
+  color: #ffffff;
+  padding: 4px;
 }
 
 QHeaderView::section::horizontal {
-  /* padding-top: 1px;
-  padding-bottom: 1px;
-  padding-left: 5px;
-  padding-right: 0px; */
+  border-bottom: 2px solid #020202;
+  border-right: 0px solid transparent;
+  border-top: 2px solid #020202;
+  border-left: 1px solid #020202;
 }
 
 QHeaderView::section::horizontal::first, QHeaderView::section::horizontal::only-one {
@@ -2420,11 +2416,16 @@ QHeaderView::section::horizontal:disabled {
 }
 
 QHeaderView::section::vertical {
+  border-bottom: 0px solid transparent;
+  border-right: 1px solid #020202;
   border-top: 1px solid #020202;
+  border-left: 1px solid #020202;
+  margin-left: 1px;
+  margin-right: 1px;
 }
 
 QHeaderView::section::vertical::first, QHeaderView::section::vertical::only-one {
-  border-top: 2px solid #020202;
+  /* border-top: 2px solid #020202; */
 }
 
 QHeaderView::section::vertical:disabled {
diff --git a/src/Gui/Stylesheets/FreeCAD Light.qss b/src/Gui/Stylesheets/FreeCAD Light.qss
index d9b0defadd..c30c32c206 100644
--- a/src/Gui/Stylesheets/FreeCAD Light.qss	
+++ b/src/Gui/Stylesheets/FreeCAD Light.qss	
@@ -2363,28 +2363,28 @@ QColumnView::item:!selected:hover {
   background-color: @ThemeAccentColor1;
 }
 
-QTableCornerButton::section {
-  background-color: #d8d8d8;
-  border: 1px transparent #ababab;
-  border-radius: 0px;
-}
-
 QTableView::item {
     color: black;
 }
-QTableView {
-  /*qproperty-AliasedCellBackgroundColor: #f700ff;*/
-  /*qproperty-aliasBgColor: #f700ff;*/
-}
-
 /* QHeaderView ------------------------------------------------------------
 
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qheaderview
 
 --------------------------------------------------------------------------- */
+
+QTableCornerButton::section {
+  background-color: #f0f0f0;
+  border-radius: 0px; /*if you remove this line it breaks it*/
+  border-bottom: 1px solid #ababab;
+  border-right: 1px solid #ababab;
+  border-top: 0px solid #ababab;
+  border-left: 0px solid #ababab;
+}
+
 QHeaderView {
   background-color: transparent;
   /* text-align: bottom; */
+  margin: -1px; /* fix for misalignement*/
 }
 
 QHeaderView:disabled {
@@ -2395,17 +2395,14 @@ QHeaderView:disabled {
 QHeaderView::section {
   background-color: qlineargradient(x1:0, y1:0.3, x2:0, y2:1, stop:0 #f0f0f0, stop:1 #fdfdfd);
   color: black;
-  border-bottom: 1px solid #ababab;
-  border-right: 1px solid #ababab;
-  border-top: 1px solid #ababab;
-  border-left: 1px solid transparent;
+  padding: 4px;
 }
 
 QHeaderView::section::horizontal {
-  /* padding-top: 1px;
-  padding-bottom: 1px;
-  padding-left: 5px;
-  padding-right: 0px; */
+  border-bottom: 2px solid #ababab;
+  border-right: 0px solid transparent;
+  border-top: 2px solid #ababab;
+  border-left: 1px solid #ababab;
 }
 
 QHeaderView::section::horizontal::first, QHeaderView::section::horizontal::only-one {
@@ -2417,11 +2414,16 @@ QHeaderView::section::horizontal:disabled {
 }
 
 QHeaderView::section::vertical {
+  border-bottom: 0px solid transparent;
+  border-right: 1px solid #ababab;
   border-top: 1px solid #ababab;
+  border-left: 1px solid #ababab;
+  margin-left: 1px;
+  margin-right: 1px;
 }
 
 QHeaderView::section::vertical::first, QHeaderView::section::vertical::only-one {
-  border-top: 2px solid #ababab;
+  /* border-top: 2px solid #ababab; */
 }
 
 QHeaderView::section::vertical:disabled {