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

Gui: Various fixes to official themes

Browse Source 
Updated PropertyEditor QLabel and QPushButton styles for better visual consistency
and usability, including specific pushbutton styling for the Placement tool. Adjusted
QCheckBox disabled indicator styles to use consistent border and background colors,
and fixed background color for checked and indeterminate disabled states.

Gave inactive and active tab their own token. Fixed missing hover for
scrollbar.

Changed the value of EditedEdgeColor in the FreeCAD Light preference
pack Due to contrast issues with default shape color.

Refreshed Theme_thumbnail_dark.png and Theme_thumbnail_light.png images.
Updated Thumbnails_themes.svg with new Inkscape version metadata, export
paths, and visual adjustments, including color and layout changes to
theme preview rectangles.

Refreshed Theme_thumbnail_dark.png and Theme_thumbnail_light.png images.
Updated Thumbnails_themes.svg with new export filenames, DPI settings,
and adjusted some SVG properties for improved export consistency.

Changed the TextDisabledColor to fix issue with lighten full black.

Adjusted the QComboBox padding-right from 2px to 18px in FreeCAD.qss to
provide space for the check-mark indicating the active item.

Changed the 'HighlightColor' value in the FreeCAD Light preference pack
configuration to dark green to solve contrast issues.

Introduces InActiveTabBackgroundColor and ActiveTabBackgroundColor to
both FreeCAD Dark and FreeCAD Light preference packs for improved tab
appearance customization.
This commit is contained in:
MisterMakerNL
2025-08-05 07:25:00 +02:00
committed by Kacper Donat
parent bf4c850a4c
commit f87a9646a7
7 changed files with 475 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,6 +153,8 @@
<FCText Name="SketcherUnderConstrainedColor">#ffffff</FCText>
<FCText Name="StylesheetIconsColor">white</FCText>
<FCText Name="TabbarBackgroundColor">@PrimaryColorDarken5</FCText>
<FCText Name="InActiveTabBackgroundColor">@PrimaryColorDarken2</FCText>
<FCText Name="ActiveTabBackgroundColor">@3DViewBackgroundRefColor</FCText>
<FCText Name="TextDisabledColor">darken(@TextForegroundColor,40)</FCText>
<FCText Name="TextEditFieldBackgroundColor">@PrimaryColor</FCText>
<FCText Name="TextForegroundColor">#ffffff</FCText>

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

@@ -168,7 +168,9 @@
<FCText Name="SketcherUnderConstrainedColor">#000000</FCText>
<FCText Name="StylesheetIconsColor">black</FCText>
<FCText Name="TabbarBackgroundColor">@PrimaryColorDarken4</FCText>
<FCText Name="TextDisabledColor">lighten(@TextForegroundColor,40)</FCText>
<FCText Name="InActiveTabBackgroundColor">@PrimaryColorDarken2</FCText>
<FCText Name="ActiveTabBackgroundColor">@3DViewBackgroundRefColor</FCText>
<FCText Name="TextDisabledColor">darken(@TabbarBackgroundColor,80)</FCText>
<FCText Name="TextEditFieldBackgroundColor">@PrimaryColorLighten3</FCText>
<FCText Name="TextForegroundColor">#000000</FCText>
<FCText Name="TextSelectBackgroundColor">@AccentHoverColor</FCText>
@@ -176,6 +178,7 @@
<FCText Name="AccentColor">@ThemeAccentColor1</FCText>
<FCText Name="AccentBackgroundColor">blend(@GeneralBackgroundColor,@AccentColor,60)</FCText>
<FCText Name="AccentHoverColor">blend(@GeneralBackgroundHoverColor,@AccentColor,30)</FCText>
<FCText Name="ToolbarButtonsPadding">2px</FCText>
</FCParamGroup>
<FCParamGroup Name="Tokens"/>
</FCParamGroup>
@@ -214,7 +217,7 @@
<FCUInt Name="HeadlightColor" Value="4059297279"/>
<FCUInt Name="HiddenLineBackground" Value="4294967040"/>
<FCUInt Name="HiddenLineFaceColor" Value="4294967040"/>
<FCUInt Name="HighlightColor" Value="2025779455"/>
<FCUInt Name="HighlightColor" Value="7995647"/>
<FCUInt Name="InternalAlignedGeoColor" Value="995875839"/>
<FCUInt Name="InvalidSketchColor" Value="4252898559"/>
<FCUInt Name="NonDrivingConstrDimColor" Value="2257491711"/>

79
src/Gui/Stylesheets/FreeCAD.qss
View File

@@ -91,10 +91,25 @@ Gui--PropertyEditor--PropertyEditor > QWidget > QFrame:focus {
background-color: @AccentColor;/* same as focused background color */}
/* hack to hide weird redundant information inside cells with links and no editable data (but editable via "..." button) */
Gui--PropertyEditor--PropertyEditor > QWidget > QWidget > QLabel {
background-color: @TextUrlColor;/* same as focused background color */
border-radius: @InputFieldBorderRadius;
background-color: @PrimaryColor;/* same as focused background color */
/* border-radius: @InputFieldBorderRadius; */
}
/* Pushbutton style for "..." inside Placement cell which launches Placement tool */
Gui--PropertyEditor--PropertyEditor > QWidget > QWidget > QPushButton,
Gui--PropertyEditor--PropertyEditor > QWidget > PushButton {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 @ButtonTopBackgroundColor,stop:1 @ButtonBottomBackgroundColor);
border: 1px solid @GeneralBorderColor;
min-width: 16px; /* reset it due to larger value on regular QPushButton, same or bigger value as regular QPushButton min-height */
border-radius: @InputFieldBorderRadius;
margin: 0px; /* reset */
padding: 0px; /* reset */
}
Gui--PropertyEditor--PropertyEditor > QWidget > QPushButton {
text-align:left;
padding-left: 2px;
}
/*==================================================================================================
Main window
==================================================================================================*/
@@ -123,13 +138,11 @@ Gui--MDIView QLabel{
Gui--MDIView QScrollArea{
border: 1px solid @GeneralBorderColor;
background-color: transparent;/* Added to maintain consistency */}
/* QWidget ----------------------------------------------------------------
This causes much load time. DONT USE "QWidget { " This causes a lot of lag.
*/
QColorDialog {
background-color: @DialogBackgroundColor;
border: 1px solid @GeneralBorderColor;
@@ -271,7 +284,7 @@ QCheckBox::indicator:unchecked:hover, QCheckBox::indicator:unchecked:focus, QChe
QCheckBox::indicator:unchecked:disabled {
background-color: @GeneralDisabledBackgroundColor;
border: 1px solid @GeneralBorderHoverColor;
border: 1px solid @CheckBoxBorderColor;
}
QCheckBox::indicator:checked {
@@ -288,6 +301,7 @@ QCheckBox::indicator:checked:disabled {
/* background-color: @PrimaryColor; */
border: 1px solid @CheckBoxBorderColor;
image: url(qss:@IconsLocationFolderName/check-mark-lightgray.svg);
background-color: @GeneralDisabledBackgroundColor;
}
QCheckBox::indicator:indeterminate {
@@ -299,6 +313,7 @@ QCheckBox::indicator:indeterminate {
QCheckBox::indicator:indeterminate:disabled {
/* background-color: @PrimaryColor; */
border: 1px solid @CheckBoxBorderColor;
background-color: @GeneralDisabledBackgroundColor;
image: url(qss:@IconsLocationFolderName/indeterminate-mark-lightgray.svg);
}
@@ -503,7 +518,7 @@ QMenu::item {
padding-left: 5px;
padding-top: 4px;
padding-bottom: 4px;
padding-right: 50px;
padding-right: 5px;
/* Reserve space for selection border */}
QMenu::item:selected {
@@ -696,7 +711,6 @@ QScrollBar::handle:vertical {
border-top: 1px solid @GeneralBorderColor;
border-bottom: 1px solid @GeneralBorderColor;
min-height: 20px;
background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 @ButtonTopBackgroundColor, stop:1 @ButtonBottomBackgroundColor);
}
@@ -704,6 +718,11 @@ QScrollBar::handle:vertical:focus {
border: 1px solid @AccentColor;
}
QScrollBar::handle:vertical:hover {
background-color: @GeneralBackgroundHoverColor;
border: 1px @ButtonTopBackgroundColor;
}
QScrollBar::add-line, QScrollBar::sub-line {
height: 12px;
width: 12px;
@@ -717,7 +736,7 @@ QScrollBar::add-line:horizontal:hover, QScrollBar::sub-line:horizontal:hover {
background-color: @GeneralBackgroundHoverColor;
}
QScrollBar::right-arrow, QScrollbar::left-arrow, QScrollBar::up-arrow, QScrollBar::down-arrow {
QScrollBar::right-arrow, QScrollBar::left-arrow, QScrollBar::up-arrow, QScrollBar::down-arrow {
margin: 2px;
}
@@ -1348,7 +1367,7 @@ QComboBox {
border-radius: @InputFieldBorderRadius;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 @ButtonTopBackgroundColor,stop:1 @ButtonBottomBackgroundColor );
padding-left: 4px;
padding-right: 2px;
padding-right: 18px; /* 18px for the check-mark that says which item is active */
min-height: 22px;
}
@@ -1777,8 +1796,8 @@ QDockWidget QTabBar { /*tabbar in dockwidget */
}
QTabBar#mdiAreaTabBar::tab:bottom:selected {
background-color: @3DViewBackgroundRefColor;
border-top: @3DViewBackgroundRefColor;
background-color: @ActiveTabBackgroundColor;
border-top: @ActiveTabBackgroundColor;
}
/*tabbar for files. */
@@ -1863,7 +1882,7 @@ QTabBar::tab:top, QDockWidget QTabBar::tab:top {
margin-left: 0px;
margin-right: 0px;
min-width: 5px;
background-color: @GeneralDisabledBackgroundColor ;
background-color: @InActiveTabBackgroundColor;
border-top: 1px solid @GeneralBorderColor;
border-bottom: 1px solid @GeneralBorderColor;
border-left: 1px solid @GeneralBorderColor;
@@ -1873,9 +1892,9 @@ QTabBar::tab:top, QDockWidget QTabBar::tab:top {
}
QTabBar::tab:top:selected, QDockWidget QTabBar::tab:top:selected {
background-color: @GeneralBackgroundColor;
background-color: @ActiveTabBackgroundColor;
border-top: 1px solid @GeneralBorderColor;
border-bottom: 1px solid @GeneralBackgroundColor;
border-bottom: 1px solid @ActiveTabBackgroundColor;
border-left: 1px solid @GeneralBorderColor;
border-right: 1px solid @GeneralBorderColor;
margin-top: 0px;
@@ -1894,7 +1913,7 @@ QTabBar::tab:top:!selected:hover, QDockWidget QTabBar::tab:top:!selected:hover {
QTabBar::tab:bottom, QDockWidget QTabBar::tab:bottom {
min-width: 5px;
background-color: @GeneralDisabledBackgroundColor ;
background-color: @InActiveTabBackgroundColor;
border-bottom: 1px solid @GeneralBorderColor;
border-top: 1px solid @GeneralBorderColor;
border-left: 1px solid @GeneralBorderColor;
@@ -1904,9 +1923,9 @@ QTabBar::tab:bottom, QDockWidget QTabBar::tab:bottom {
}
QTabBar::tab:bottom:selected, QDockWidget QTabBar::tab:bottom:selected {
background-color: @GeneralBackgroundColor;
background-color: @ActiveTabBackgroundColor;
border-bottom: 1px solid @GeneralBorderColor;
border-top: 1px solid @GeneralBackgroundColor;
border-top: 1px solid @ActiveTabBackgroundColor;
border-left: 1px solid @GeneralBorderColor;
border-right: 1px solid @GeneralBorderColor;
margin-bottom: 0px;
@@ -1925,7 +1944,7 @@ QTabBar::tab:bottom:!selected:hover, QDockWidget QTabBar::tab:bottom:!selected:h
QTabBar::tab:left, QDockWidget QTabBar::tab:left {
min-height: 5px;
background-color: @GeneralDisabledBackgroundColor ;
background-color: @InActiveTabBackgroundColor;
border-bottom: 1px solid @GeneralBorderColor;
border-right: 1px solid @GeneralBorderColor;
border-left: 1px solid @GeneralBorderColor;
@@ -1935,9 +1954,9 @@ QTabBar::tab:left, QDockWidget QTabBar::tab:left {
}
QTabBar::tab:left:selected, QDockWidget QTabBar::tab:left:selected {
background-color: @GeneralBackgroundColor;
background-color: @ActiveTabBackgroundColor;
border-bottom: 1px solid @GeneralBorderColor;
border-right: 1px solid @GeneralBackgroundColor;
border-right: 1px solid @ActiveTabBackgroundColor;
border-left: 1px solid @GeneralBorderColor;
border-top: 1px solid @GeneralBorderColor;
margin-left: 0px;
@@ -1955,7 +1974,7 @@ QTabBar::tab:left:!selected:hover, QDockWidget QTabBar::tab:left:!selected:hover
QTabBar::tab:right, QDockWidget QTabBar::tab:right {
min-height: 5px;
background-color: @GeneralDisabledBackgroundColor ;
background-color: @InActiveTabBackgroundColor;
border-bottom: 1px solid @GeneralBorderColor;
border-left: 1px solid @GeneralBorderColor;
border-right: 1px solid @GeneralBorderColor;
@@ -1965,9 +1984,9 @@ QTabBar::tab:right, QDockWidget QTabBar::tab:right {
}
QTabBar::tab:right:selected, QDockWidget QTabBar::tab:right:selected {
background-color: @GeneralBackgroundColor;
background-color: @ActiveTabBackgroundColor;
border-bottom: 1px solid @GeneralBorderColor;
border-left: 1px solid @GeneralBackgroundColor;
border-left: 1px solid @ActiveTabBackgroundColor;
border-left: 1px solid @GeneralBorderColor;
border-top: 1px solid @GeneralBorderColor;
margin-right: 0px;
@@ -2442,7 +2461,7 @@ QDateEdit::drop-down, QDateTimeEdit::drop-down {
subcontrol-origin: padding;
subcontrol-position: top right;
width: 12px;
border-left: 1px solid ;
border-left: 1px solid;
}
QDateEdit::down-arrow, QDateTimeEdit::down-arrow {
@@ -2605,14 +2624,10 @@ QGroupBox[objectName="matOpsGrpBox"] QPushButton {
min-width: 235px;
}
QToolBar > Gui--WorkbenchComboBox QAbstractItemView {
min-width: 180px;
margin-left: 30px;
border: 1px solid @GeneralBorderColor;
padding-left: -27px;
background-color: transparent;
}
Gui--WorkbenchComboBox {
padding-right: -10px;
}
/* Below is a fix for indentation in properties*/

4
src/Gui/Stylesheets/overlay/Freecad Overlay.qss
View File

@@ -133,11 +133,11 @@ Gui--OverlayToolButton::pressed,
Gui--OverlayToolButton:checked {
border: 0.5px solid @GeneralBorderColor;
border-radius: 1px;
background-color: @UserHighlight1Color;
background-color: @ThemeAccentColor1;
}
Gui--OverlayToolButton:checked:hover {
border: 0.5px solid @UserHighlight1Color;
border: 0.5px solid @ThemeAccentColor1;
background-color: @3DViewBackgroundRefColor
}

BIN
src/Mod/Start/Gui/Resources/thumbnails/Theme_thumbnail_dark.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 25 KiB

BIN
src/Mod/Start/Gui/Resources/thumbnails/Theme_thumbnail_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 30 KiB

829
src/Mod/Start/Gui/Resources/thumbnails/Thumbnails_themes.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 580 KiB

After

Width:  |  Height:  |  Size: 582 KiB