Commit Graph

320 Commits

Author SHA1 Message Date
Uwe Rathmann a32204cd8c QskAspect::Flag replaced by QskAspect::NoType. Flag was a leftover from
the very early stages of this project and its semantics had become wrong
in the meantime
2023-03-02 12:19:32 +01:00
Uwe Rathmann 99eb5c3695 using graphics for the spin box button indicators 2023-03-02 09:16:55 +01:00
Uwe Rathmann 99079a666e disable QskSpinBox buttons when reaching minimum/maximum 2023-03-01 16:09:17 +01:00
Uwe Rathmann 28432446e6 Material is using the term "Ripple" for 2 different type of effects - Flutter
calls them "Splash" and "Highlight". We are using Splash too.
2023-03-01 10:51:46 +01:00
Uwe Rathmann a6bf60c9b4 upgraded to uncrustify 0.76.0 - still not happy with the C++ beautifier
situation, that requires way too much manual post processing
2023-02-28 15:49:42 +01:00
Uwe Rathmann 9b2c2a8f12 Squiek settings for the spin box added 2023-02-27 15:21:09 +01:00
Uwe Rathmann c0eb74f292 wip 2023-02-27 14:46:31 +01:00
Uwe Rathmann a67d23420f QskMenu::Overlay settings fixed ( working for Squiek again ) 2023-02-27 14:06:57 +01:00
Uwe Rathmann c1354f49a3 according to: https://m3.material.io/components/divider/specs 2023-02-27 10:14:17 +01:00
Uwe Rathmann 5bbd304b94 Merge branch 'RadioBox' of https://github.com/clemensmanert/qskinny into clemensmanert-RadioBox 2023-02-26 15:42:15 +01:00
Uwe Rathmann 6618c91479 QskColorFilter::mask 2023-02-26 15:07:08 +01:00
Peter Hartmann deb921d579 M3: Style text input correclty 2023-02-26 14:04:23 +01:00
Peter Hartmann f4531c149c color filter: Add option to substitute alpha value
Resolves #253
2023-02-26 14:04:23 +01:00
Clemens Manert c3a4472587
Code cleanup 2023-02-25 23:39:33 +01:00
Clemens Manert 4310ee3c34
Remove unused imports 2023-02-25 23:36:02 +01:00
Clemens Manert 72190aee91
Fix alighnment if sizes of symbol and button differ 2023-02-25 23:36:02 +01:00
Uwe Rathmann 06ba85605b QskSpinBox work in progress 2023-02-23 14:37:49 +01:00
Peter Hartmann 1d57d87332 Gallery: Add buttons with different emphasis and style for M3 2023-02-23 10:19:42 +01:00
Clemens Manert 518c401ac7
Code cleanup 2023-02-20 21:56:33 +01:00
Clemens Manert 2775ecc7ed
Code cleanup 2023-02-20 21:56:33 +01:00
Clemens Manert e4a07909ac
Add Squiek theme 2023-02-20 21:56:33 +01:00
Clemens Manert 49cd540ce0
Add disabled support 2023-02-20 21:56:33 +01:00
Clemens Manert 5fa060617c
Use dpi instead of pixel 2023-02-20 21:56:33 +01:00
Clemens Manert f5c7f7f2b4
Add animation support for the Ripple, remove focusedItem 2023-02-20 21:56:33 +01:00
Clemens Manert 92ba2385db
Rename radio to button 2023-02-20 21:56:32 +01:00
Clemens Manert 8c0a54e54a
Add QskRadioBox 2023-02-20 21:56:26 +01:00
Uwe Rathmann 0c2bc32abd focus handling removed ( spin boxes do not have an internal focus chain
), formal adjustments
2023-02-19 14:24:09 +01:00
uwerat cf449f174f
Merge branch 'master' into qskspinbox 2023-02-19 10:25:04 +01:00
Peter Hartmann a89d3def3b Add new control QskComboBox
Resolves #102
2023-02-17 17:26:06 +01:00
Peter Hartmann 9cdc1f6357 material style: remove common hints
Resolves #211
2023-02-17 17:26:06 +01:00
Peter Hartmann cf2e17def5 QskMenu: Add own subcontrol Overlay
... so we can style it differently from the one of the QskPopup
2023-02-17 17:26:06 +01:00
Vogel, Rick 04fa1c6dd6 remove non-theme color 2023-02-17 14:46:54 +01:00
Vogel, Rick ad7a20053c refactoring + focused state 2023-02-17 13:32:47 +01:00
Vogel, Rick ba9ec8e783 initial commit of QskSpinBox 2023-02-17 13:28:44 +01:00
uwerat 6071ce74d2
Merge branch 'master' into qskspinbox 2023-02-17 13:22:39 +01:00
Vogel, Rick ac8a3dea9b initial commit of QskSpinBox 2023-02-17 12:01:56 +01:00
Uwe Rathmann 66db409b71 QskAspect::Placement renamed to QskAspect::Variation so that we use the
corresponding bits for an emphasis too
2023-02-15 16:37:54 +01:00
Uwe Rathmann 454688361c orientation removed from the placement bits 2023-02-15 16:16:19 +01:00
Peter Hartmann 1b6f3285dc segmented bar: Improve styling 2023-02-01 17:18:22 +01:00
Peter Hartmann c58593669d segmented bar: Add own checkmark
The checkmark is slightly different from the one used in the
check box.
2023-02-01 17:18:22 +01:00
Peter Hartmann 9d1b2568e5 segmented bar: Allow icon and text 2023-02-01 17:18:22 +01:00
Peter Hartmann 03e24d5fea push button: Support more alignments of icon and text 2023-01-24 09:51:36 +01:00
Peter Hartmann f98af6d298 M3 buttons: Fix icons
Also for the gallery use the ones from M3.
2023-01-24 09:51:36 +01:00
Peter Hartmann 3b45b90011 CheckBox: Add error state and style for material 2023-01-16 08:15:41 +01:00
Peter Hartmann 4352410128 check box: Add ripple effect and style for M3 2023-01-16 08:15:41 +01:00
Peter Hartmann 540c3ea180 Material 3: fix push button size
Turns out the button was too small, hence the skewed display.
2023-01-09 15:11:38 +01:00
Uwe Rathmann c1e194b464 hide QskScrollView::Panel 2022-12-05 12:06:49 +01:00
Uwe Rathmann c5ace32bf2 QskAspect::Control renamed to QskAspect::NoSubcontrol 2022-11-18 12:29:58 +01:00
Uwe Rathmann b140d1b30a QskGradientDirection introduced - no more classes derived from
QskGradient
2022-11-13 17:22:09 +01:00
Uwe Rathmann f14036c124 using QskGrdient::Stops for separator hints 2022-10-31 18:02:35 +01:00
Uwe Rathmann ad67d035f3 new QskGradient 2022-10-31 14:42:08 +01:00
Uwe Rathmann 99132276fc first adjustments for QskGradient improvements 2022-10-24 16:02:46 +02:00
Uwe Rathmann 0cda639d87 initializations simplified 2022-10-21 16:47:53 +02:00
Uwe Rathmann 4b1ac99740 compiler warning fixed 2022-10-14 17:13:03 +02:00
Uwe Rathmann 4f8a76234a index added for animator lookups to allow smooth transitions f.e when
selcting an cell in a list box
2022-09-13 12:40:44 +02:00
Uwe Rathmann cb7acb6b92 QskDialogButton subcontrols removed. In case we need to make them
different from normal push buttons we should introduce a "dialog" section, where we can avoid having to duplicate all hint settings
2022-09-09 12:36:21 +02:00
Peter Hartmann c4000eb44b Material 3: Calculate real pixels from device-independent pixels
Resolves #210
2022-08-31 19:29:39 +02:00
Uwe Rathmann b84dfc8226 QskSubcontrolLayoutEngine introduced 2022-08-26 12:56:12 +02:00
Uwe Rathmann 896145ac11 QskTextOptions as skin hints 2022-08-25 09:39:33 +02:00
Uwe Rathmann bc5510f7ef temporary improvements for push buttons - until we have a general layout class
for graphic/text combinations
2022-08-03 18:28:53 +02:00
Uwe Rathmann 9fdaf8aef6 clipping the ripple into the button panel 2022-07-18 09:11:45 +02:00
Peter Hartmann 7eed06659b push button: Allow for animations when clicking
Which e.g. the Material 3 style does
2022-07-15 13:50:04 +02:00
Uwe Rathmann 4ef3fe3164 initial tabbar position as skin hint ( QskTabBar::Panel | QskAspect::Style ) 2022-07-15 10:44:32 +02:00
Uwe Rathmann ff7cb37edc using QskRgb 2022-07-15 08:39:52 +02:00
Peter Hartmann f1101f1706 Material: Fix Header and Footer boxes
At some later point, we can introduce an application window class.
Also, move tabs to bottom.
Also, add some tinted surface colors.
2022-07-15 07:55:13 +02:00
Peter Hartmann 45fa6e3f08 Material: Fix subwindow hint 2022-07-15 07:55:13 +02:00
Peter Hartmann 48a902a660 scroll view: Allow styling via panel 2022-07-15 07:55:13 +02:00
Peter Hartmann 8ece05272d Material 3: style popup overlay 2022-07-15 07:55:13 +02:00
Uwe Rathmann 209fbaef97 keep upper case letters for skin names 2022-07-14 13:55:35 +02:00
Uwe Rathmann 6c3d261ab5 bye, bye dummy pseudo material skin, we will continue with material3 instead 2022-07-11 21:10:29 +02:00
Peter Hartmann d79a2b5226 Change copyright 2022-07-06 14:48:06 +02:00
Peter Hartmann 8b98a64f50 Remove unused statement 2022-07-06 14:47:49 +02:00
Peter Hartmann 240784b99c switch: fix ripple style 2022-07-06 14:24:25 +02:00
Peter Hartmann 413e6e88d6 checkboxes: Remove animation for now 2022-07-06 14:11:11 +02:00
Peter Hartmann 606d5ddef1 style scroll view and list view 2022-07-06 13:56:25 +02:00
Peter Hartmann 567753df84 fix tab buttons 2022-07-06 13:27:35 +02:00
Peter Hartmann 8ff290410e style dialog button 2022-07-06 12:39:31 +02:00
Peter Hartmann 2fcc7c77ca Improve fonts
Setting the proper weight makes the fonts pixel perfect now
2022-07-06 12:39:31 +02:00
Peter Hartmann f0fbb084f6 style dialogs 2022-07-06 12:10:47 +02:00
Peter Hartmann 7b247c67fe style listbox 2022-07-05 14:19:55 +02:00
Peter Hartmann a429bfb7b8 slider: flatten handle color when disabled 2022-07-05 13:44:39 +02:00
Peter Hartmann 9ecafddc49 Slider: Add ripple and style it 2022-07-05 13:41:18 +02:00
Peter Hartmann d97f17c859 style active tab button 2022-07-05 13:02:07 +02:00
Peter Hartmann ed767b9161 style buttons when hovered, focused and pressed 2022-07-05 11:44:19 +02:00
Peter Hartmann c8f28c05dc style check box 2022-07-05 10:51:26 +02:00
Peter Hartmann ec4fc1d1b2 bring back old squiek skin 2022-07-05 09:54:09 +02:00
Peter Hartmann 38d2f5e4b6 Bring back the old Material skin for now 2022-07-05 09:49:05 +02:00
Peter Hartmann 53faf27d8f Merge branch 'uwerat-master' into material-theme
This means remove the outlined and text buttons for now
2022-07-05 09:33:43 +02:00
Peter Hartmann 5ff92a9fb8 Material: Rename new skin to Material3 2022-07-05 08:46:51 +02:00
Uwe Rathmann f7cd259fb0 using QskSkin::symbol for the indicator 2022-07-01 12:40:52 +02:00
Uwe Rathmann 080fcdb69f Starting with a simpler version of QskCheckBox ( no tristate ), but with
having an optional text.
2022-07-01 11:10:59 +02:00
Uwe Rathmann 3c5b6f9f01 QskAbstractButton::Flat removed, using QskAspect::Header instead 2022-06-29 16:21:54 +02:00
Peter Hartmann 6332a27764 fix build after merge 2022-06-27 14:50:54 +02:00
Peter Hartmann 879b4144b1 Merge branch 'uwerat-master' into material-theme 2022-06-27 10:35:49 +02:00
Uwe Rathmann 6c7ba0489c M(aterial)2 related code replaced 2022-06-25 16:14:08 +02:00
Peter Hartmann 74ccd3e4df style segmented bar in disabled state 2022-06-17 18:23:40 +02:00
Peter Hartmann fecfd7c5c7 move some colors to the palette 2022-06-17 17:44:05 +02:00
Peter Hartmann 752982fa03 improve shadow 2022-06-17 15:45:03 +02:00
Peter Hartmann 4e581486c3 style segmented bar some more 2022-06-17 12:50:35 +02:00
Peter Hartmann 9ab96db757 style segmented bar 2022-06-17 09:37:04 +02:00
Peter Hartmann 8a22a2f7bb Add shadow to menus and move shadows to palette 2022-06-17 09:37:04 +02:00
Peter Hartmann 56f25bd74c fix button size again, was lost in a merge 2022-06-15 11:37:02 +02:00
Peter Hartmann bac7a2024a Merge branch 'uwerat-master' into material-theme 2022-06-15 10:58:56 +02:00
Peter Hartmann 8ee681588e Revert "QskPushButton: respect the graphics alignment"
This reverts commit 3c69498026.
2022-06-15 10:57:36 +02:00
Peter Hartmann 74e036c355
QskPushButton: respect the graphics alignment (#193)
Also, respect the padding hint of the graphic

Resolves #22
2022-06-15 10:34:51 +02:00
Peter Hartmann 4aa0c7de79 fix menu 2022-06-14 12:09:07 +02:00
Peter Hartmann f8070c1bf0 fix build 2022-06-14 11:26:12 +02:00
Peter Hartmann c3dd5efd1a improve button shadow 2022-06-14 10:26:43 +02:00
Peter Hartmann 42ab3fcb85 add shadow to buttons 2022-06-13 17:41:50 +02:00
Peter Hartmann 3a0b3b077d style menu 2022-06-13 17:11:27 +02:00
Peter Hartmann 4841e39813 small fix for switch 2022-06-08 11:50:43 +02:00
Peter Hartmann e6b85e528b button: Add more states to cover different button types 2022-06-08 11:48:29 +02:00
Peter Hartmann a810739254 Revert "Material skin: Allow setting a different palette"
This reverts commit 421db106da.

We cannot easily change this on the fly anyhow.
2022-06-07 16:21:04 +02:00
Peter Hartmann 421db106da Material skin: Allow setting a different palette 2022-06-07 14:03:06 +02:00
Peter Hartmann a2d67f0438 Material: set up fonts 2022-06-07 12:58:50 +02:00
Peter Hartmann 1839cd452f Material: More skin hints 2022-06-07 12:14:50 +02:00
Peter Hartmann 3c69498026 QskPushButton: respect the graphics alignment
Also, respect the padding hint of the graphic

Resolves #22
2022-06-07 11:44:41 +02:00
Peter Hartmann 8a14b75747 Material: Set values according to new palette 2022-06-07 11:09:25 +02:00
Peter Hartmann fdd19894fb fixup Material: Move palette generation around 2022-06-03 10:23:02 +02:00
Peter Hartmann 17185addeb fixup? Material: Use predefined palettes in skin 2022-06-03 09:52:22 +02:00
Peter Hartmann 6281a6afe0 Material: Use predefined palettes
At some later point we might want to make the palettes settable,
so the user can define his own palettes.
2022-06-03 09:11:29 +02:00
Peter Hartmann d1fb1e71cb fixup 2022-06-02 18:25:35 +02:00
Uwe Rathmann 535d94b494 nothing useful, but fixes compiler error 2022-05-02 16:43:50 +02:00
Uwe Rathmann 41de0f3933 Merge branch 'master' into material-theme 2022-05-02 16:27:16 +02:00
Uwe Rathmann 8039ebd785 compiler erors fixed 2022-04-20 15:32:14 +02:00
Uwe Rathmann 12a3dd06da boilerplate code to have QskSegmentedBar in the gallery. 2022-04-20 15:25:15 +02:00
Uwe Rathmann 50ee82fbaa QskSegmentedBar ( inspired by the IOS segmented control ) added 2022-04-20 14:14:37 +02:00
Uwe Rathmann e689575510 suing QskMenu::Segement instead of Qskmenu::Cell to be in line with other
controls
2022-04-20 13:58:53 +02:00
Uwe Rathmann 87c9bcd85c Merge branch 'master' into material-theme 2022-04-16 12:27:25 +02:00
Uwe Rathmann d52453311f heuristic for initializing the cascading property moved from skin to
QskMenu
2022-04-16 12:25:39 +02:00
Uwe Rathmann 6adee18cb7 QskMenu initialization fixed 2022-04-05 11:55:26 +02:00
Uwe Rathmann 1ce1188f4b Merge branch 'master' into material-theme 2022-04-05 11:46:05 +02:00
Uwe Rathmann 2a6d27d78d wip 2022-04-05 11:38:23 +02:00
Uwe Rathmann 526003f173 Merge branch 'master' into material-theme 2022-04-05 10:19:00 +02:00
Uwe Rathmann 6ef1f8a45d QskCheckBox improvements 2022-04-05 08:48:16 +02:00
Uwe Rathmann d5a1ce19c9 Merge branch 'master' into material-theme 2022-04-04 18:13:31 +02:00
Clemens Manert a05d1e3471
Add a Checkbox (#169)
* Add checkbox

* Add checkbox tests

* Add checkbox-groups

* Add checkbox-groups tests
2022-04-04 08:53:20 +02:00
Uwe Rathmann 45e0d8b537 code grouped 2022-04-03 16:24:50 +02:00
Uwe Rathmann afefaf952a using gardients instead of colors 2022-04-02 11:50:55 +02:00
Uwe Rathmann bf2ad4ee13 merge from master 2022-04-01 17:00:50 +02:00
Uwe Rathmann 0cd577c977 making QskSwtchButton smaller 2022-04-01 13:57:26 +02:00
Uwe Rathmann 570d3d2d51 Uing RGB values instead of colors. QskSkinTransition reimplemented.
Ongoing work
2022-03-31 18:29:39 +02:00
Uwe Rathmann 60e27536e8 using QString::compare 2022-03-27 19:06:29 +02:00
Uwe Rathmann 345f24f621 Merge branch 'improve-material-theme' of https://github.com/clemensmanert/qskinny into clemensmanert-improve-material-theme 2022-03-26 15:57:02 +01:00
Uwe Rathmann c3eb20ee98 using QStringLiteral 2022-03-25 10:32:14 +01:00
Clemens Manert 6f42dae3e3
Improve material theme 2022-02-19 00:30:23 +01:00
Peter Hartmann ac8ef9cd5a
Box renderer: Support border gradients (#158)
* QskBoxBorderColors: Use gradients instead of colors

* QskBoxBorderColors: rename API

* render gradients on borders

* boxes example: Also draw gradient borders

* calculate proper numbers of needed border colors

* fixup with example

* support rounded corners

* support more colors in rounded color gradients

I THINK WE DON'T REALLY NEED THIS COMMIT

* We don't need this commit either

* Revert "We don't need this commit either"

This reverts commit 2dc38064f7fee1d0505262fe5cebcf9e1fb16cea.

* Revert "support more colors in rounded color gradients"

This reverts commit 5754d2d0773d8273d42ae1775b53d40f5e6af26a.

* fix borders for rect ellipses

* play around a bit

* small fixes

* some helper stuff and missing stuff

* user border colors

* close to something working somehow

* works a bit better

* put it into an own function

* rearrange a bit

* something's off

* still off, but seems like we need an additional line

* works but hackish

* now it works

* bring back samples

* correction

* pimp up example

* fix normal rendering

* some more debugging etc.

* turn around gradients

* turn around rectangular gradients as well

* turn around easier

* more test cases

* fix fill case

* more test cases

* clean up a bit

* clean up example

* clean up some more

* incorporate feedback from Uwe

* fix bug when using horizontal gradients
2022-02-04 16:11:11 +01:00
Uwe Rathmann 36001a6fec menu separators added 2022-01-06 18:36:15 +01:00
Uwe Rathmann 1feccd942a QskPageIndicator improved 2022-01-04 13:58:34 +01:00
Uwe Rathmann 89a2a395fd QskMenu::Cursor transition fixed 2021-12-29 17:19:19 +01:00