Commit Graph

133 Commits

Author SHA1 Message Date
Max Wilfinger
a41921924f Merge pull request #22459 from kadet1090/stylesheet-fixes
Stylesheet: Various fixes
2025-07-15 04:58:06 +02:00
MisterMakerNL
dc2f2374b6 Adding PNG back for now
Adding it back because old stylesheet is not compitable with SVG.  Hopefully it can be removed soon.
2025-07-14 20:51:42 +02:00
Kacper Donat
53c0b56e74 Stylesheets: Fix file chooser buttons not displaying dots 2025-07-14 20:48:50 +02:00
Kacper Donat
09ecda8dc1 Stylesheets: Fix jumping entries on Windows
Co-authored-by: MisterMakerNL <marijn82@gmail.com>
2025-07-14 20:48:50 +02:00
Kacper Donat
50b0dc691c Stylesheets: Fix property editor headers 2025-07-14 20:48:50 +02:00
Kacper Donat
efc0cd6ede Stylesheets: Fix empty line between header and content in QSInt 2025-07-14 20:48:49 +02:00
Kacper Donat
aa180b3443 Stylesheets: Properly utilize AccentColor 2025-07-14 20:48:49 +02:00
Kacper Donat
374c40adde Stylesheets: Unify border on ScrollBars 2025-07-14 20:48:49 +02:00
Kacper Donat
4f7a608217 Stylesheets: Remove QTabBar color inconsistencies 2025-07-14 20:48:49 +02:00
Kacper Donat
4a719a784d Stylesheets: Remove padding and marign resets.
Setting margins and padding to 0 on * disables margins supplied by the
QStyle. That was required when QStyle was not enforced but now it can
cause trouble.
2025-07-14 20:48:49 +02:00
Kacper Donat
9b92902c0d Gui: Rename FreeCAD_stylesheet.qss into FreeCAD.qss
This removes redundant suffix from the file name.
2025-07-14 20:48:49 +02:00
MisterMaker
5fa2d62f6c Gui: Implement style parameters for built-in themes (#20528)
* added code to add more parameters to stylesheets

and test QSS files which will probably be removed when testing is completed

* update

* Update CMakeLists.txt

* some tweeks

* reverting this as it should not have been uploaded

* Update User_dark.qss

* more stuff

* code cleanup

* synced light to dark

* tweaks!!

* Fixed the qsint action tab

* tweaks

* push latest changed getting ready for release.

* tweaks

* Update FreeCAD Dark.qss

* fixessss

* wrong radiusss

* Update FreeCAD Light.cfg

changed the light background too F0f0f0

* disable tweaks

* modifications to use ThemeToken manager

See https://github.com/FreeCAD/FreeCAD/pull/20668

* Undo bunch of stuff.

* bugs

* Clean-up

* more cleanup

* Update FreeCAD_stylesheet.qss

* Big update + cleanup

* Update FreeCAD Light.cfg

* Changed UserColor to Primary

* Update actionpanelscheme.cpp

rtying to fix merge issues

* trying to fix merge issues

* clean-up

* Update FreeCAD_stylesheet.qss

* Refactor theme color variables and improve widget styling

Unified color variable naming by replacing '@PrimaryColorUIColor' and related tokens with '@PrimaryColor' and new lighten/darken variants in both dark and light theme configs and stylesheets. Added new variables for input field border radius and checkbox/radio button colors, and updated QSS rules to use these variables for consistent widget appearance. Improved styling for checkboxes, radio buttons, and input fields, and fixed menu indicator icons for better theme compatibility.

* Checkboxes and radioboxes

Rounded off the checkboxes add buttons for radioboxes.

* updated icons

* Refine toolbar, checkbox, and toolbox styles

Updated QToolButton#qt_toolbar_ext_button to use border-image and improved gradient backgrounds. Enhanced checkbox indicator styling for better color consistency and hover/disabled states. Adjusted gradients and background colors for QTabBar, QDockWidget, QHeaderView, and QToolBox elements to improve visual coherence and accessibility.

* Refine FreeCAD Dark theme hover and selection colors

Updated the FreeCAD Dark theme configuration and stylesheet to introduce new hover and border color tokens, unify hover/selection backgrounds, and replace most uses of @UserHighlight1Color/@UserHighlight2Color with @GeneralBackgroundHoverColor and @GeneralBorderHoverColor. Adjusted color lightening values for better contrast and consistency across UI elements.

* Fix QHeaderView gradient direction in stylesheet

Corrects the gradient parameters for QHeaderView::section to use y1 and y2, ensuring the background gradient renders as intended.

* Update FreeCAD Light theme user tokens

Changed MenuBackgroundColor to use @PrimaryColorLighten1 and SketcherUnderConstrainedColor to #000000. Added new tokens GeneralBackgroundHoverColor and GeneralBorderHoverColor for improved UI customization.

* Update FreeCAD Dark.cfg

* Add padding to QMenuBar items in stylesheet

Updated the FreeCAD stylesheet to include specific padding for QMenuBar::item, improving menu item spacing and appearance.

* I added the old stylesheets back for fallback

I added the old stylesheets back in the case of in forseen issues.

* Update Freecad Overlay.qss

* Refactor color tokens in Dark and Light theme configs

I sorted the tags and linked accent colors

* Update QPushButton styles for improved consistency

Adjusted padding and min-width for QPushButton elements to enhance visual consistency across dialogs and tables. Updated QTableView QPushButton styles to include hover effects and removed redundant selectors.

* Adjust QPushButton vertical padding in stylesheet

Reduced the vertical padding of QPushButton from 4px to 3px to refine button appearance and alignment.

* Adjust QPushButton styles in dialogs and panels

Updated QDialogButtonBox QPushButton to have 3px vertical padding instead of 4px, and removed special styling for QMessageBox buttons. Added a new style for QPushButton inside QFrame panels with 3px padding and no minimum width.

* undo some changes

* Update grid lines color in FreeCAD Light theme

Changed the GeneralGridLinesColor from @PrimaryColorLighten2 to @PrimaryColorDarken4 in the FreeCAD Light theme configuration for improved visual consistency.

* Update menu background color in FreeCAD Dark theme

Changed the MenuBackgroundColor from @PrimaryColorLighten4 to @PrimaryColorDarken4 in the FreeCAD Dark theme configuration to improve visual consistency.

* Update FreeCAD Dark.cfg

* Refactor selection background color handling

Introduces TextSelectBackgroundColor in both FreeCAD Dark and Light preference packs for more flexible selection styling. Updates stylesheet to use TextSelectBackgroundColor instead of UserHighlight1Color and removes redundant selection-background-color rules for improved consistency and maintainability.
Selection color is just a toned down color from the accent 1 color. This makes it better readable.

* Selection color had issues with treeview select

* woopsie add pink to find issues removed it

* Update src/Gui/Stylesheets/CMakeLists.txt

---------

Co-authored-by: Kacper Donat <kadet1090@gmail.com>
2025-07-11 21:33:14 +00:00
Alfredo Monclus
e45cf96afb Gui: Tasks: fix in place close and ok buttons 2025-06-19 18:42:24 +02:00
Max Wilfinger
ccf27775dc Gui: Center notification label and disable show report view by default (#21872)
* Gui: Center notification label and disable show report view by default

* Stylesheet: min-width: 0 for QStatusBar QPushButton
2025-06-16 11:03:58 -05:00
Kacper Donat
aafc7c1ba6 Gui: Ensure width and height of QAbstractView checkboxes 2025-06-03 23:43:39 +02:00
Alfredo Monclus
cb290a2396 Gui: property-editor fix text not showing due to stylesheets 2025-05-29 15:01:11 +02:00
Alfredo Monclus
e06b495c6f Gui: fix light/dark switch when on classic (#21049)
* Gui: fix: taskpanel light/dark switch when on classic

* Gui: fix: taskpanel double icon

* Apply suggestions from code review

---------

Co-authored-by: Kacper Donat <kadet1090@gmail.com>
2025-05-21 14:00:54 +00:00
Furgo
efee3a34bf Stylesheets: fix undo button arrows on FreeCAD Dark/Light themes
Co-authored-by: MisterMakerNL <marijn82@gmail.com>
Fixes: #19372
2025-04-15 20:33:45 +02:00
Kacper Donat
4c5c88bcf4 Gui: Remove -1 min-width from dialog buttons
This ensures that minimum width from QStyle is still applied while buttons still respect minimum size hint
2025-03-24 12:25:56 -05:00
Guillaume Roguez
e127f2c884 fix dialogs button size in case of long text
Let the layout engine computes the size of all QPushButton by unset
the minimalSize value set by "min-width" QSS property in themes.

Fix #18019.
2025-03-19 13:37:47 +01:00
Syres916
f4468f21f2 [BIM] Material dialog - fix the minimum width of four buttons in new group box 2025-03-12 06:05:08 +00:00
Syres916
ef0252f935 [BIM} Correct styling of DeleteIFCProperties window and add GroupBox 2025-03-10 13:49:57 +00:00
Alfredo Monclus
635839029f start: fix filecard text visibility on classic theme also fixes hover and pressed states 2025-03-05 13:23:39 -03:00
Syres916
34d9ac0050 [Gui] Fix Close without Saving button size (#19342) 2025-02-02 23:24:27 +01:00
luzpaz
67c772553b Fix typos
Found via codespell
2025-01-29 08:31:01 +01:00
MisterMaker
a593893ccc [stylesheets] Gathering of stylesheet fixes (#18929)
* this is a workaround to remove caps

pelase ignore this hackery

* And now the caps are gone

* a bunch of small tweaks and fixes.

* Update FreeCAD Light.qss

updated menubar color light theme

* updated the buttons a tiny bit

* Fix for to short buttons.

Couldn't test it since my macro window is broken.

Co-Authored-By: Syres916 <46537884+Syres916@users.noreply.github.com>

* qspinbox disabled tweaks.

* Update FreeCAD Dark.qss

Tweaked the buttons a bit so they are more in line with the light theme.

* Update FreeCAD Dark.qss

small tweaks

* reversed the spreadsheet headers gradient for dark

* Update light with undo arrows position

Co-Authored-By: Syres916 <46537884+Syres916@users.noreply.github.com>

* Update undo buttons arrow position dark

Co-Authored-By: Syres916 <46537884+Syres916@users.noreply.github.com>

* added an offset to qcombobox

* removed the fix since it ruined every Qcombobox.

* Tabs update more clean less gradients.

* Update DlgMacroExecuteImp.cpp

fixing conflicts

* Update DlgMacroExecuteImp.cpp

* Delete DlgMacroExecuteImp.cpp

* Create DlgMacroExecuteImp.cpp

* Revert "Create DlgMacroExecuteImp.cpp"

This reverts commit 8de8f7506177d773bb356fd0e22a66466c25b668.

* Revert "Delete DlgMacroExecuteImp.cpp"

This reverts commit 41315f31abdad79afd4b696ee15c603de3e4a6a1.

* Revert "Update DlgMacroExecuteImp.cpp"

This reverts commit aa792291684e2d674f6961c641c8e2f8b9af12c8.

* Revert "Update DlgMacroExecuteImp.cpp"

This reverts commit e8376a8fdf11d7fd014f2c46f189afdca42833ce.

* Delete src/Gui/DlgMacroExecuteImp.cpp

* Update DlgMacroExecuteImp.cpp

finally realized what was going on lol

---------

Co-authored-by: Syres916 <46537884+Syres916@users.noreply.github.com>
2025-01-27 17:49:20 +01:00
PaddleStroke
f30139367a Stylesheet toolbar background (#18831) 2025-01-13 11:21:17 -06:00
MisterMaker
6acd1fe3d0 Stylesheets spreadsheets visual fix. (#18719)
* this fixes the spreadsheet alignment and the corner button

* missed a line
2025-01-06 17:55:13 +01:00
luzpaz
ed40de3e23 Fix various typos
Found via codespell.
2024-11-15 20:18:46 +01:00
MisterMakerNL
14068183b7 fixing the checked toolbutton issue in Qsint
https://github.com/FreeCAD/FreeCAD/issues/17230
2024-10-14 08:14:09 -05:00
MisterMaker
e1f65ee831 Overlay blur fix + slightly less white background (#15886)
* remove bluw changed the white background to 2 steps below white

* Delete CMakeSettings.json

* Revert "remove bluw changed the white background to 2 steps below white"

This reverts commit a8cab51f0eb6fc5eb6cb3644d1d13f9421a9b05d.
2024-08-26 10:48:00 -05:00
MisterMaker
103ab1e28e Stylesheet fixes-part VI: The return of the comma (#15806)
This should fix a bunch of issues, like the white arrows the blue select background. @maxwxyz
2024-08-12 11:58:19 -04:00
Syres916
970dc4710d [Gui] Overlay hide mode improve contrast in both themes... 2024-08-12 11:37:06 -04:00
luzpaz
b5281158f3 Fix various typos 2024-08-11 12:09:27 -04:00
MisterMaker
7db8e118b7 Stylesheet-fixes V: The final frontier (#15742) 2024-08-05 11:07:49 -05:00
MisterMaker
c4bb689a85 Stylesheet fixes part IV - A new hope (to be done for 1.0) (#15586)
* 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
2024-07-29 17:31:17 -05:00
MisterMaker
9c6663c924 Stylesheet fixes part trois. (#15471)
* fixes Qtoolbox for Freecad CAM

https://github.com/FreeCAD/FreeCAD/issues/14745#issuecomment-2231031485

* Removed offset because of Linux issues.

* fix for to dark cells in propetties panel

* fixed constrain colors in sketcher and arros tabbar.

* tabbar fixes

* This fixes the checkered scrollbar issue

* This fixes the spinbox arrow which had a gap.

* misses somethings in the overlay stylesheets.

* typos

* fixed some overlay issues

* update sketch uncontrained colors

* trying to fix the arrow size

* fixes for treeview

* Update Light Theme + Dark Background.qss

fix for edit text field

* updated checkmarks names and scaled them down.

* Update FreeCAD Dark.qss

oopsie wrong color

* Update icons classic.svg

icons files for the icons

* fix for table edit
2024-07-22 11:12:21 -05:00
MisterMaker
3a32ae9985 Stylesheet fixes (#14749) 2024-07-15 16:26:28 -05:00
Kacper Donat
c1c41bd88f Gui: Ability to target new file buttons fia QSS.
This adds ability to target New File buttons via `#CreateNewRow >
QPushButton` selector.
2024-07-15 10:43:05 -05:00
MisterMaker
6cdb38f975 (GUI) Delete dark behave. (#14827) 2024-07-01 11:11:00 -05:00
MisterMakerNL
4bbff00727 fix for lag 2024-06-16 22:18:20 -05:00
MisterMakerNL
78a25c53c8 Update CMakeLists.txt
I used the wrong names, so it didn't work.
I did tested it and it did worked once, not sure what happend.
2024-06-16 22:18:20 -05:00
MisterMaker
b205922c42 Default stylesheets revision + clean-up (#13772)
* Added the new QSS file with images

Added the new QSS file with images

* fixed some disabled colors to be the same everywhere.

* update

* big update fixed the scrollbars and lots more.

* small tweaks

* small fixes

* fixed groupbox in qsint

* Added light classic

This light theme is basicallyt exactly no-stylesheet.

* fixed the tabs

* fixed background reportview

* updated overlay stylesheets

* Added preference settings from Opentheme @obelisk79

* tabbar tweaks

* forgot the gradients on dark

* Overlay stylesheets clean-up +move icon to folder.

* removing old stylesheets

removing old stylesheets

* it was icons not icon, fixed it.

* updated cmake and package.xml

* to many spaces

* removing old theme's

* updated default overlay qss

* removed my settings files

* updated cfg files

* Bunch of fixes

I compiled it and didn't see any issues anymore. Could be some discussions about the new startpage thumbnails.

* fixed up double arrows and the correct logo!

* updated the work file for the icons

* Sets no-stylesheet overlay to a stylesheet.

* type in cmakelist

* type in filename

* oeps did set the dark theme

* Update OverlayManager.cpp

I removed a bit to much reverting this line

* fixed text color issue in Qsint on the light theme and dark background

* Update Light Theme + Dark Background.qss

Fine tuning the treeview it now works good for ligth theme and dark brackgrounds.

* removed prodark added back Behave dark overlay

@Syres916 I deleted the overlay qss behave dark by accident.
But you might want to check this PR out since it changes a lot.

I deleted Pro-dark since it was not updated and is outdated and it looks also a lot like the default dark.

* Update Light Theme + Light Background.qss

Fixes

* small fixes

small fixes

* remove ProDark

* Update CMakeLists.txt

* changed the thumbnails

Also removed teh dimensions in the filename since that got annoying real fast :)

* Updated other overlay stylesheets

* missing extension

* cleanup and some fixes to the overlay.

* Update Dark Theme + Light Background.qss

udpated the dark theme overaly with light background for all you maniacs who use this.

* Title bar fix for windows

This makes it so that it uses black title bar in windows if you have dark mode

* updated white background and some colors

* I think I fix merge issue now.

* Some cleanup on the thumbnails

* Create CMakePresets.json

* idk

* trying to fix conflicts

* removing old themes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Some fixes for Qsint sketcher toolbars icons

* fixed merge issue with maingui

* trying to fix merge conflicts

* and removing again.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-06-13 22:13:05 -05:00
Syres916
245e66ed3a [Gui] Fix BehaveDark StatusBar Flickering Border...
...and sync tooltip colours and size
2024-06-10 11:08:44 -05:00
obelisk79
3eb45b045c [UI] Logo Update (#14284)
* Updating instances of FreeCAD's old logo to reflect the new Logo

* updating additional instances of the Logo

* updating additional instances of the Logo

* Update logo for windows installer

* Update logo reference to /src/Gui/Icons/freecad.svg
2024-05-27 15:33:55 -04:00
MisterMakerNL
cb6901f1e0 Small fix to issue in the menu
Small fix to issue in the menu
2024-05-16 21:27:50 -04:00
MisterMaker
2d49fcefe2 Overlay fix for default windows style and other light theme's. (#12573)
* Removing white spaces

* Fixes made by Kadet

I am cleaning up my previous PR because of the white space removal.
I now make a single commit with the white space stuff and one with Kadet fixes.

Co-Authored-By: Kacper Donat <kacper@kadet.net>

* Delete CMakeSettings.json

screwed it up

* added stylesheet for example code.

* added example to cmakelist

* Mouse over fix

This fixes the mouse over issue!

Co-Authored-By: Bas Ruigrok <14298143+Rexbas@users.noreply.github.com>

* Added more overlay stylesheet for all options

* Removed reddudant code!

* Fixed the code

Works great!

Co-Authored-By: Bas Ruigrok <14298143+Rexbas@users.noreply.github.com>

---------

Co-authored-by: Kacper Donat <kacper@kadet.net>
Co-authored-by: Bas Ruigrok <14298143+Rexbas@users.noreply.github.com>
2024-04-29 11:24:33 -05:00
Kacper Donat
34b6b36547 Sketcher: Disable visibility checkbox for external geometry 2024-01-21 20:33:49 +01:00
Syres916
ce1a43ed2c [Gui] Fix Status Bar Tooltip Visibility 2024-01-13 09:15:18 -06:00
MisterMaker
650521fb53 [Stylesheets] Fix for new settings menu (#11609)
It can probably use some more tweaks but this way it is bug free.
2023-12-04 11:44:05 -03:00