kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Stylesheet fixes part IV - A new hope (to be done for 1.0) (#15586)

Browse Source 
* Qcolor dialog fixes

* Fix for white hoover on tabbar

* Changes active color and selected feature color

* update same colors in cfg

* fix for tab pan in material editor

* some fixes

mostly theme accent colors fixes.

* fixed text edit being cut off

https://github.com/FreeCAD/FreeCAD/issues/15603

* extend arrow fix

https://github.com/FreeCAD/FreeCAD/issues/15616

* checkboxes links qpushbuttons etc.

Fixed https://github.com/FreeCAD/FreeCAD/issues/15610#event-13642470770
and hopefully also
https://github.com/FreeCAD/FreeCAD/issues/15136#issuecomment-2254156398

* fixed selection-text color in the preference menu also White is white.

* forgot checkbox spacing for light

* colors update

fix for https://github.com/FreeCAD/FreeCAD/issues/15660#event-13670498420
and
https://github.com/FreeCAD/FreeCAD/issues/15620#issuecomment-2251144435

* Delete CMakeSettings.json

* get out of here

* title a tat higher

* change rubberband from white to blue to make it work with white background.

* setting the colors.

* tree colors
This commit is contained in:
MisterMaker
2024-07-30 00:31:17 +02:00
committed by GitHub
parent 04acc05fcb
commit c4bb689a85
9 changed files with 121 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Gui/GLPainter.cpp
View File

@@ -223,8 +223,8 @@ Rubberband::Rubberband() : viewer(nullptr)
working = false;
stipple = true;
rgb_r = 1.0f;
rgb_g = 1.0f;
rgb_r = 0.27f;
rgb_g = 0.4f;
rgb_b = 1.0f;
rgb_a = 1.0f;
}

4
src/Gui/PreferencePacks/FreeCAD Classic/FreeCAD Classic.cfg
View File

@@ -125,8 +125,8 @@
<FCUInt Name="DefaultShapeColor" Value="3435980543"/>
</FCParamGroup>
<FCParamGroup Name="TreeView">
<FCUInt Name="TreeEditColor" Value="4294902015"/>
<FCUInt Name="TreeActiveColor" Value="3873898495"/>
<FCUInt Name="TreeEditColor" Value="563609599"/>
<FCUInt Name="TreeActiveColor" Value="1538528255"/>
</FCParamGroup>
<FCParamGroup Name="MainWindow">
<FCBool Name="TiledBackground" Value="0"/>

8
src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg
View File

@@ -4,6 +4,11 @@
<FCParamGroup Name="Root">
<FCParamGroup Name="BaseApp">
<FCParamGroup Name="Preferences">
<FCParamGroup Name="Themes">
<FCUInt Name="ThemeAccentColor1" Value="1252392959"/>
<FCUInt Name="ThemeAccentColor2" Value="3027763199"/>
<FCUInt Name="ThemeAccentColor3" Value="4290017279"/>
</FCParamGroup>
<FCParamGroup Name="View">
<FCUInt Name="SketchEdgeColor" Value="4059297279"/>
<FCUInt Name="SketchVertexColor" Value="4059297279"/>
@@ -34,6 +39,7 @@
<FCInt Name="AntiAliasing" Value="4"/>
<FCInt Name="RenderCache" Value="0"/>
<FCInt Name="SegmentsPerGeometry" Value="100"/>
<FCUInt Name="BoundingBoxColor" Value="4059297279"/>
<FCFloat Name="BoundingBoxFontSize" Value="10.000000000000"/>
<FCFloat Name="ViewScalingFactor" Value="1.000000000000"/>
<FCBool Name="EnableBacklight" Value="1"/>
@@ -44,7 +50,7 @@
<FCBool Name="UseBackgroundColorMid" Value="0"/>
<FCInt Name="BacklightIntensity" Value="70"/>
<FCInt Name="DefaultShapeTransparency" Value="0"/>
<FCBool Name="Simple" Value="1"/>
<FCBool Name="Simple" Value="1"/>
<FCUInt Name="AnnotationTextColor" Value="2914369023"/>
<FCUInt Name="BackgroundColor" Value="993737727"/>
<FCUInt Name="BackgroundColor2" Value="1482187775"/>

8
src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg
View File

@@ -3,6 +3,11 @@
<FCParamGroup Name="Root">
<FCParamGroup Name="BaseApp">
<FCParamGroup Name="Preferences">
<FCParamGroup Name="Themes">
<FCUInt Name="ThemeAccentColor1" Value="1252392959"/>
<FCUInt Name="ThemeAccentColor2" Value="3027763199"/>
<FCUInt Name="ThemeAccentColor3" Value="4290017279"/>
</FCParamGroup>
<FCParamGroup Name="Mod">
<FCParamGroup Name="Start">
<FCBool Name="FileCardUseStyleSheet" Value="0"/>
@@ -44,7 +49,7 @@
<FCUInt Name="LightTextColor" Value="1230002175"/>
<FCUInt Name="TemplateUnderlineColor" Value="995875839"/>
</FCParamGroup>
<FCParamGroup Name="Dimensions">
<FCParamGroup Name="Dimensions">
<FCUInt Name="Color" Value="556083711"/>
</FCParamGroup>
<FCParamGroup Name="Markups">
@@ -97,6 +102,7 @@
<FCInt Name="ConstructionPattern" Value="64764"/>
<FCInt Name="InternalPattern" Value="61166"/>
<FCInt Name="ExternalPattern" Value="58596"/>
<FCUInt Name="BoundingBoxColor" Value="556083711"/>
</FCParamGroup>
<FCBool Name="AutoRemoveRedundants" Value="1"/>
</FCParamGroup>

14
src/Gui/PreferencePages/DlgSettingsViewColor.ui
View File

@@ -342,9 +342,9 @@
</property>
<property name="color" stdset="0">
<color>
<red>255</red>
<green>255</green>
<blue>0</blue>
<red>94</red>
<green>170</green>
<blue>35</blue>
</color>
</property>
<property name="prefEntry" stdset="0">
@@ -373,11 +373,11 @@
<property name="toolTip">
<string>Background color for active containers in tree view</string>
</property>
<property name="color" stdset="0">
<property name="color" stdset="0">rgb(60, 145, 252)
<color>
<red>230</red>
<green>230</green>
<blue>255</blue>
<red>60</red>
<green>145</green>
<blue>252</blue>
</color>
</property>
<property name="prefEntry" stdset="0">

124
src/Gui/Stylesheets/FreeCAD Dark.qss
View File

@@ -41,8 +41,9 @@ Resetting everything helps to unify styles across different operating systems
border-style: none;
border-image: none;
outline: 0;
color: White;
color: white;
selection-background-color: @ThemeAccentColor1;
selection-color: white;
}
/* specific reset for elements inside QToolBar */
@@ -88,7 +89,7 @@ Gui--PropertyEditor--PropertyEditor QComboBox {
/* fix for column items background when a link is present */
Gui--PropertyEditor--PropertyEditor > QWidget > QFrame:focus {
background-color: @ThemeAccentColor1; /* same as focused background color */
background-color: @ThemeAccentColor2; /* same as focused background color */
}
/* hack to hide weird redundant information inside cells with links and no editable data (but editable via "..." button) */
@@ -125,9 +126,9 @@ This causes much load time.
/* background-color: #444444; */
/* border: 0px solid #020202;
padding: 0px;
color: White; */
color: white; */
/* selection-background-color: @ThemeAccentColor1; */
/* selection-color: White; */
/* selection-color: white; */
/* } */
QWidget:disabled {
@@ -140,6 +141,13 @@ QWidget::item:selected {
background-color: @ThemeAccentColor1;
}
QColorDialog QWidget {
background-color: #333333;
color: white;
selection-background-color: @ThemeAccentColor1;
selection-color: black;
}
/* Causes issue with colorselector.
QWidget::item:hover:!selected {
background-color: @ThemeAccentColor1;
@@ -242,6 +250,7 @@ QCheckBox {
outline: none;
border: 1px solid transparent;
background-color: transparent;
spacing:8px;
}
QCheckBox:focus {
@@ -318,7 +327,7 @@ QGroupBox {
background-color: #3c3c3c;
border: 1px solid #444444;
border-radius: 2px;
margin-top: 3ex; /* leave space at the top for the title */
margin-top: 18px; /* leave space at the top for the title */
}
QGroupBox::title {
@@ -370,7 +379,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qradiobutton
--------------------------------------------------------------------------- */
QRadioButton {
background-color: transparent;
color: White;
color: white;
border: none;
spacing: 4px;
padding-top: 4px;
@@ -388,7 +397,7 @@ QRadioButton:disabled {
QRadioButton QWidget {
background-color: transparent;
color: White;
color: white;
spacing: 0px;
padding: 0px;
outline: none;
@@ -441,7 +450,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenubar
--------------------------------------------------------------------------- */
QMenuBar {
background-color: #252525;
color: White;
color: white;
selection-background-color: @ThemeAccentColor1;
}
@@ -462,7 +471,7 @@ QMenuBar::item:selected {
QMenuBar::item:pressed {
border: 0px solid #020202;
background-color: @ThemeAccentColor1;
color: White;
color: white;
}
/* QMenu ------------------------------------------------------------------
@@ -472,7 +481,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenu
--------------------------------------------------------------------------- */
QMenu {
border: 1px solid #3c3c3c;
color: White;
color: white;
margin: 0px;
background-color: #252525;
selection-background-color: @ThemeAccentColor1;
@@ -496,7 +505,7 @@ QMenu::item {
}
QMenu::item:selected {
color: White;
color: white;
background-color: @ThemeAccentColor1;
}
@@ -614,13 +623,13 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
--------------------------------------------------------------------------- */
QAbstractItemView {
alternate-background-color: #5b5b5b;
color: White;
color: white;
border: 1px solid #020202;
border-radius: 2px;
}
QAbstractItemView QLineEdit {
padding: 2px;
padding: 0 2px;
}
/* QAbstractScrollArea ----------------------------------------------------
@@ -635,7 +644,7 @@ QAbstractScrollArea {
/* fix #159 */
padding: 0px;
/* remove min-height to fix #244 */
color: White;
color: white;
}
QAbstractScrollArea:disabled {
@@ -802,7 +811,7 @@ report view
--------------------------------------------------------------------------- */
QTextEdit {
background-color: #444444;
color: White;
color: white;
border-radius: 2px;
border: 0px solid #020202;
}
@@ -821,7 +830,7 @@ Python
--------------------------------------------------------------------------- */
QPlainTextEdit {
background-color: #3c3c3c;
color: White;
color: white;
border-radius: 1.9px;
border: 0px solid #020202;
}
@@ -832,7 +841,7 @@ QPlainTextEdit:focus {
QPlainTextEdit:selected {
background: @ThemeAccentColor1;
color: White;
color: white;
}
/* QSizeGrip --------------------------------------------------------------
@@ -916,19 +925,18 @@ QToolBar::separator:vertical {
/*The "show more" button (it can also be stylable with "QToolBarExtension" icon is not working Qproperty works but breaks when you move the toolbar see also */
QToolButton#qt_toolbar_ext_button {
margin: 0px;
padding: 0px;
background-repeat: none;
background-position: center center;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #7c7c7c, stop:1 #898989);
padding: 0px;
}
QToolButton#qt_toolbar_ext_button:hover {
background-color: @ThemeAccentColor1;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #b4b4b4, stop:1 #c0c0c0);
}
QToolButton#qt_toolbar_ext_button:on {
border-color: #020202;
background-color: @ThemeAccentColor1;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #b4b4b4, stop:1 #c0c0c0);
}
@@ -939,7 +947,7 @@ QAbstractSpinBox,
QSpinBox {
background-color: #252525;
border: 1px solid #020202;
color: White;
color: white;
border-radius: 2px;
min-height: 1.7em;
padding-left: 4px;
@@ -1004,7 +1012,7 @@ QAbstractSpinBox:focus {
}
QAbstractSpinBox:selected {
background: @ThemeAccentColor2;
background: @ThemeAccentColor1;
}
/* ------------------------------------------------------------------------ */
@@ -1030,7 +1038,7 @@ QLabel:disabled {
}
QLabel[haslink="true"] {
color: orange;
color: #0080ff;
}
@@ -1042,7 +1050,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qabstractscrollarea
QTextBrowser {
background-color: #252525;
border: 1px solid #020202;
color: White;
color: white;
border-radius: 1.9px;
}
@@ -1062,8 +1070,9 @@ QTextBrowser:hover, QTextBrowser:!hover, QTextBrowser:selected, QTextBrowser:pre
QGraphicsView {
background-color: transparent;
border: 0px solid @ThemeAccentColor1;
color: White;
color: white;
border-radius: 0px;
selection-background-color: @ThemeAccentColor1;
}
QGraphicsView:disabled {
@@ -1095,7 +1104,7 @@ QCalendarWidget:disabled {
--------------------------------------------------------------------------- */
QLCDNumber {
background-color: #1aff00;
color: White;
color: white;
}
QLCDNumber:disabled {
@@ -1111,7 +1120,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qprogressbar
QProgressBar {
background-color: #cccccc;
border: 1px solid #020202;
color: White;
color: white;
border-radius: 1.9px;
text-align: center;
}
@@ -1146,11 +1155,11 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qpushbutton
--------------------------------------------------------------------------- */
QPushButton {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #252525);
color: White;
color: white;
border: 1px solid #020202;
/* border-bottom-color: #1e1e1e; simulates shadow under the button */
border-radius: 3px;
padding: 4px 0px;
padding: 4px;
min-width: 80px;
}
@@ -1171,7 +1180,7 @@ QPushButton:checked {
}
QPushButton:focus {
border: 1px solid @ThemeAccentColor1;
border: 1px solid @ThemeAccentColor2;
}
@@ -1187,7 +1196,7 @@ QPushButton:checked:selected {
QPushButton:hover {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #444444, stop:1 #333333);
color: White;
color: white;
}
QPushButton:pressed {
@@ -1196,7 +1205,7 @@ QPushButton:pressed {
QPushButton:selected {
border: 1px solid @ThemeAccentColor1;
color: White;
color: white;
}
QPushButton::menu-indicator {
@@ -1217,7 +1226,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbutton
--------------------------------------------------------------------------- */
QToolButton {
background-color: transparent;
color: White;
color: white;
/* border-radius: 1px; */
padding: 2px;
outline: none;
@@ -1257,11 +1266,11 @@ QToolButton:checked:pressed {
QToolButton:checked:selected {
background: @ThemeAccentColor2;
color: White;
color: white;
}
QToolButton:hover {
color: White;
color: white;
border: 1px solid #020202;
}
@@ -1270,7 +1279,7 @@ QToolButton:pressed {
QToolButton:selected {
border: 1px solid @ThemeAccentColor1;
color: White;
color: white;
}
/* QToolButton[popupMode="0"] { */
@@ -1361,7 +1370,7 @@ QToolButton::menu-arrow:hover {
QCommandLinkButton {
background-color: transparent;
border: 1px solid #020202;
color: White;
color: white;
border-radius: 1.9px;
padding: 0px;
margin: 0px;
@@ -1409,12 +1418,12 @@ QComboBox QAbstractItemView {
QComboBox QAbstractItemView:hover {
background-color:#252525;
color: White;
color: white;
}
QComboBox QAbstractItemView:selected {
background: @ThemeAccentColor1;
color: White;
color: white;
}
QComboBox QAbstractItemView:alternate {
@@ -1442,7 +1451,7 @@ QComboBox:focus {
}
QComboBox:on {
selection-background-color: @ThemeAccentColor2;
selection-background-color: @ThemeAccentColor1;
}
QComboBox::indicator {
@@ -1476,7 +1485,7 @@ QComboBox::item:alternate {
/* Color of the selected list item. */
QComboBox::item:selected {
border: 1px solid #020202;
background: @ThemeAccentColor2;
background: @ThemeAccentColor1;
}
QComboBox::drop-down {
@@ -1808,7 +1817,7 @@ QLineEdit {
border-style: solid;
border: 1px solid #020202;
border-radius: 2px;
color: White;
color: white;
}
QLineEdit:disabled {
@@ -1818,7 +1827,7 @@ QLineEdit:disabled {
QLineEdit:hover {
/* border: 1px solid @ThemeAccentColor1; */
color: White;
color: white;
}
QLineEdit:focus {
@@ -1849,7 +1858,8 @@ QTabWidget::pane {
margin: 0px;
/* Fixes double border inside pane with pyqt5 */
padding: 0px;
background-color: rgba(27, 27, 27, 0.549);
background-color: rgba(74, 74, 74, 54);
border: 1px solid #202020;
}
QTabWidget::pane:selected {
@@ -2020,7 +2030,7 @@ QTabBar::tab:bottom:selected, QDockWidget QTabBar::tab:bottom:selected {
}
QTabBar::tab:bottom:!selected:hover, QDockWidget QTabBar::tab:bottom:!selected:hover {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #d8d8d8, stop:1 #f0f0f0);
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #444444);
margin-bottom: 0px;
}
@@ -2315,7 +2325,7 @@ QListView,
QTableView,
QColumnView {
background-color: #252525; /* background of a lot of stuff including spreadsheets.*/
color: White;
color: white;
gridline-color: #020202;
border-radius: 0px;
selection-background-color: @ThemeAccentColor1;
@@ -2339,14 +2349,14 @@ QListView:selected,
QTableView:selected,
QColumnView:selected {
background-color: #333333;
color: White;
color: white;
}
QTreeView:focus,
QListView:focus,
QTableView:focus,
QColumnView:focus {
/* border: 1px solid #020202; */
/* background-color: @ThemeAccentColor2; */
}
QTreeView::item:pressed,
@@ -2360,7 +2370,7 @@ QTreeView::item:selected:active,
QListView::item:selected:active,
QTableView::item:selected:active,
QColumnView::item:selected:active {
background-color: @ThemeAccentColor2;
background-color: @ThemeAccentColor1;
}
QTreeView::item:selected:!active,
@@ -2375,7 +2385,7 @@ QListView::item:!selected:hover,
QTableView::item:!selected:hover,
QColumnView::item:!selected:hover {
outline: 0;
color: White;
color: white;
background-color: @ThemeAccentColor1;
}
@@ -2410,7 +2420,7 @@ QHeaderView:disabled {
QHeaderView::section {
background-color: qlineargradient(x1:0, y1:0.3, x2:0, y2:1, stop:0 #333333, stop:1 #252525);
color: White;
color: white;
border-bottom: 1px solid #020202;
border-right: 1px solid #020202;
border-top: 1px solid #020202;
@@ -2487,7 +2497,7 @@ QToolBox:selected {
QToolBox::tab {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #252525);
color: White;
color: white;
border-radius: 4px;
border: 1px solid #020202;
image: none;
@@ -2650,12 +2660,12 @@ QDateEdit QAbstractItemView, QDateTimeEdit QAbstractItemView {
--------------------------------------------------------------------------- */
QAbstractView:hover {
border: 1px solid @ThemeAccentColor1;
color: White;
color: white;
}
QAbstractView:selected {
background: @ThemeAccentColor1;
color: White;
color: white;
}
/* PlotWidget -------------------------------------------------------------
@@ -2793,7 +2803,7 @@ QWidget#thumbnailWidget {
}
QWidget#thumbnailWidget[state="hovered"] {
border: 1px solid @ThemeAccentColor2;
border: 1px solid @ThemeAccentColor1;
}
QWidget#thumbnailWidget[state="pressed"] {

41
src/Gui/Stylesheets/FreeCAD Light.qss
View File

@@ -43,6 +43,7 @@ Resetting everything helps to unify styles across different operating systems
outline: 0;
color: black;
selection-background-color: @ThemeAccentColor1;
selection-color: black;
}
/* specific reset for elements inside QToolBar */
@@ -88,7 +89,7 @@ Gui--PropertyEditor--PropertyEditor QComboBox {
/* fix for column items background when a link is present */
Gui--PropertyEditor--PropertyEditor > QWidget > QFrame:focus {
background-color: @ThemeAccentColor1; /* same as focused background color */
background-color: @ThemeAccentColor2; /* same as focused background color */
}
/* hack to hide weird redundant information inside cells with links and no editable data (but editable via "..." button) */
@@ -140,6 +141,13 @@ QWidget::item:selected {
background-color: @ThemeAccentColor1;
}
QColorDialog QWidget {
background-color: #f0f0f0;
color: black;
selection-background-color: @ThemeAccentColor1;
selection-color: white;
}
/* Causes issue with colorselector.
QWidget::item:hover:!selected {
background-color: @ThemeAccentColor1;
@@ -242,6 +250,7 @@ QCheckBox {
outline: none;
border: 1px solid transparent;
background-color: transparent;
spacing:8px;
}
QCheckBox:focus {
@@ -318,7 +327,7 @@ QGroupBox {
background-color: #ededed;
border: 1px solid #d8d8d8;
border-radius: 2px;
margin-top: 3ex; /* leave space at the top for the title */
margin-top: 18px; /* leave space at the top for the title */
}
QGroupBox::title {
@@ -620,7 +629,7 @@ QAbstractItemView {
}
QAbstractItemView QLineEdit {
padding: 2px;
padding: 0 2px;
}
/* QAbstractScrollArea ----------------------------------------------------
@@ -924,12 +933,11 @@ background-position: center center;
}
QToolButton#qt_toolbar_ext_button:hover {
background-color: @ThemeAccentColor1;
background-color: transparent;
}
QToolButton#qt_toolbar_ext_button:on {
border-color: #ababab;
background-color: @ThemeAccentColor1;
background-color: transparent;
}
@@ -1005,7 +1013,7 @@ QAbstractSpinBox:focus {
}
QAbstractSpinBox:selected {
background: @ThemeAccentColor2;
background: @ThemeAccentColor1;
}
/* ------------------------------------------------------------------------ */
@@ -1022,6 +1030,7 @@ QLabel {
padding: 2px;
margin: 0px;
color: black;
spacing:8px;
}
QLabel:disabled {
@@ -1031,7 +1040,7 @@ QLabel:disabled {
}
QLabel[haslink="true"] {
color: orange;
color: #0050a1;
}
@@ -1151,7 +1160,7 @@ QPushButton {
border: 1px solid #ababab;
/* border-bottom-color: #1e1e1e; simulates shadow under the button */
border-radius: 3px;
padding: 4px 0px;
padding: 4px;
min-width: 80px;
}
@@ -1162,7 +1171,6 @@ QPushButton {
QPushButton:disabled {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #e2e2e2, stop:1 #fdfdfd);
color: #adadad;
border: 1px solid #ababab;
}
@@ -1173,7 +1181,7 @@ QPushButton:checked {
}
QPushButton:focus {
border: 1px solid @ThemeAccentColor1;
border: 1px solid @ThemeAccentColor2;
}
@@ -1444,7 +1452,7 @@ QComboBox:focus {
}
QComboBox:on {
selection-background-color: @ThemeAccentColor2;
selection-background-color: @ThemeAccentColor1;
}
QComboBox::indicator {
@@ -1478,7 +1486,7 @@ QComboBox::item:alternate {
/* Color of the selected list item. */
QComboBox::item:selected {
border: 1px solid #ababab;
background: @ThemeAccentColor2;
background: @ThemeAccentColor1;
}
QComboBox::drop-down {
@@ -1851,7 +1859,8 @@ QTabWidget::pane {
margin: 0px;
/* Fixes double border inside pane with pyqt5 */
padding: 0px;
background-color: rgba(27, 27, 27, 0.549);
background-color: rgba(227, 227, 227, 84);
border: 1px solid #d8d8d8;
}
QTabWidget::pane:selected {
@@ -2362,7 +2371,7 @@ QTreeView::item:selected:active,
QListView::item:selected:active,
QTableView::item:selected:active,
QColumnView::item:selected:active {
background-color: @ThemeAccentColor2;
background-color: @ThemeAccentColor1;
}
QTreeView::item:selected:!active,
@@ -2795,7 +2804,7 @@ QWidget#thumbnailWidget {
}
QWidget#thumbnailWidget[state="hovered"] {
border: 1px solid @ThemeAccentColor2;
border: 1px solid @ThemeAccentColor1;
}
QWidget#thumbnailWidget[state="pressed"] {

4
src/Gui/Tree.cpp
View File

@@ -3795,7 +3795,7 @@ void DocumentItem::slotInEdit(const Gui::ViewProviderDocumentObject& v)
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/TreeView");
unsigned long col = hGrp->GetUnsigned("TreeEditColor", 4294902015);
unsigned long col = hGrp->GetUnsigned("TreeEditColor", 563609599);
QColor color(App::Color::fromPackedRGB<QColor>(col));
if (!getTree()->editingItem) {
@@ -5238,7 +5238,7 @@ void DocumentObjectItem::setHighlight(bool set, Gui::HighlightMode high) {
f.setUnderline(underlined);
f.setOverline(overlined);
unsigned long col = hGrp->GetUnsigned("TreeActiveColor", 3873898495);
unsigned long col = hGrp->GetUnsigned("TreeActiveColor", 1538528255);
color = App::Color::fromPackedRGB<QColor>(col);
}
else {

4
src/Gui/TreeParams.cpp
View File

@@ -117,9 +117,9 @@ public:
funcs["KeepRootOrder"] = &TreeParamsP::updateKeepRootOrder;
TreeActiveAutoExpand = handle->GetBool("TreeActiveAutoExpand", true);
funcs["TreeActiveAutoExpand"] = &TreeParamsP::updateTreeActiveAutoExpand;
TreeActiveColor = handle->GetUnsigned("TreeActiveColor", 3873898495);
TreeActiveColor = handle->GetUnsigned("TreeActiveColor", 1538528255);
funcs["TreeActiveColor"] = &TreeParamsP::updateTreeActiveColor;
TreeEditColor = handle->GetUnsigned("TreeEditColor", 2459042047);
TreeEditColor = handle->GetUnsigned("TreeEditColor", 563609599);
funcs["TreeEditColor"] = &TreeParamsP::updateTreeEditColor;
SelectingGroupColor = handle->GetUnsigned("SelectingGroupColor", 1082163711);
funcs["SelectingGroupColor"] = &TreeParamsP::updateSelectingGroupColor;