Commit Graph

1530 Commits

Author SHA1 Message Date
Uwe Rathmann 0d49820cad bad memory allocation size fixed 2022-10-18 17:36:55 +02:00
Uwe Rathmann 4592ebfd3d Merge branch 'master' of https://github.com/uwerat/qskinny 2022-10-15 13:25:25 +02:00
Uwe Rathmann b6032f007c wrong check fixed 2022-10-15 13:24:58 +02:00
Uwe Rathmann 618a97235e auto keyword 2022-10-14 17:13:57 +02:00
Uwe Rathmann 6fef215310 using QskGradient::hash 2022-10-14 17:13:33 +02:00
Uwe Rathmann 51a7e4e589 Using our own gradient shaders ( no dependencies from quickshapes
anymore ). shapes/Gradient has not yet been merged into QskGradient
and we still have some stupid conversions to QGradient in the way.
2022-10-13 19:39:57 +02:00
Uwe Rathmann 929c02fa0e colorTable generation added 2022-10-13 19:39:24 +02:00
Uwe Rathmann 8da486a13f QskGradientStops moved from QskGradient.h to QskGradientStop.h 2022-10-13 19:37:49 +02:00
Uwe Rathmann 9d640d3f06 Qt5 fixes 2022-10-07 16:17:52 +02:00
Uwe Rathmann 1c98c90e8c radial gradints fixed 2022-10-07 14:32:20 +02:00
Uwe Rathmann 477a284cfa more expressive API 2022-10-05 09:38:35 +02:00
Uwe Rathmann 8052074c42 Conical->Conic ( following CSS naming ) 2022-10-04 12:46:17 +02:00
Uwe Rathmann f031e78a7b storing path and transformation to know when geometry updates are
necessary
2022-09-30 15:23:55 +02:00
Uwe Rathmann ee7dbb300a scaling of pens moved to QskStrokeNode 2022-09-30 15:09:52 +02:00
Uwe Rathmann cd19b047ab setting an initial material, so that the node can be inserted into the
scene grapf without rnning into Qt assertions
2022-09-30 15:08:19 +02:00
Uwe Rathmann 45e59d6c10 wip 2022-09-29 17:26:15 +02:00
Uwe Rathmann f798f2228c more details around shapes 2022-09-29 16:50:46 +02:00
Uwe Rathmann 634ca3bed3 smarter matrial updates 2022-09-29 12:40:22 +02:00
Uwe Rathmann b138d04053 shaders for gradients ( QGradient variations ) added 2022-09-28 20:14:10 +02:00
Uwe Rathmann a13dcf8428 QskShapeNode added 2022-09-26 17:51:07 +02:00
Uwe Rathmann 12e462e657 filling the vertex buffer fixed 2022-09-26 17:50:07 +02:00
Uwe Rathmann 60efe3649b QSK_EXPORT added 2022-09-26 17:49:47 +02:00
Uwe Rathmann 3ccaa113fd QskShapeNode introduced ( completely untestest, without gradients in the
first version )
2022-09-26 14:44:23 +02:00
Uwe Rathmann 96906e04ca code reorganized 2022-09-26 14:44:06 +02:00
Uwe Rathmann b2d7d77640 QskStrokeNode introduced ( untested so far ) 2022-09-23 17:49:49 +02:00
Uwe Rathmann ab34af0b03 include changed 2022-09-23 17:49:13 +02:00
Uwe Rathmann 9cb3bc6ab9 compare operation fixed 2022-09-23 12:39:34 +02:00
Uwe Rathmann 36e84e53b6 code simplified 2022-09-20 08:43:39 +02:00
Uwe Rathmann 3a0796e085 calculation of the cube animtor matrix aligned ( still some questions
left concerning non symmetric calculations )
2022-09-16 18:06:16 +02:00
Uwe Rathmann cb67a057d7 compiler error fixed 2022-09-13 13:05:47 +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 7ca1e2f261 uncrustified 2022-09-13 12:22:20 +02:00
Uwe Rathmann 1900adbabb Using a flat map ( sorted std::vector ) instead of a std:map for the
animators. Preperations for inntroducing aspect/index as lookup key.
2022-09-12 18:18:51 +02:00
Uwe Rathmann a4a6e28ecc unused member removed 2022-09-12 18:16:07 +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
Uwe Rathmann 4ca5e798c8 broken state changes fixed 2022-09-09 12:01:30 +02:00
Uwe Rathmann 996e849fc5 startHintTransitions added to be able to start transitions withot
changing the state
2022-09-09 11:29:47 +02:00
Uwe Rathmann 47df732f4a better seperation between state animators and those for skin changes 2022-09-09 10:25:46 +02:00
Uwe Rathmann 50ec41868d some APIs narrowed from QskAspect to QskAspect::Subcontrol 2022-09-09 09:30:15 +02:00
Uwe Rathmann beddc2569f early check for animators 2022-09-06 08:00:18 +02:00
Uwe Rathmann b926476e55 QskHintAnimatorTable::isEmpty added 2022-09-06 07:57:08 +02:00
Uwe Rathmann 8088664465 less operator added 2022-09-04 10:37:40 +02:00
Uwe Rathmann bfab362bbb Qt 6.4 compatibility fix 2022-08-29 17:44:57 +02:00
Uwe Rathmann c72f4be8d6 crashes fixed 2022-08-29 15:42:19 +02:00
Uwe Rathmann df5eb382f9 QskSubcontrolLayoutEngine improved 2022-08-29 15:02:43 +02:00
Uwe Rathmann 45e157c2c6 code moved to QskSubcontrolLayoutEngine 2022-08-29 14:17:13 +02:00
Uwe Rathmann 1cb0461829 debug print removed 2022-08-29 12:06:35 +02:00
Uwe Rathmann 4c190ffe49 unregisterFactories added 2022-08-29 10:28:13 +02:00
Uwe Rathmann 2479064f58 spacing added 2022-08-26 13:19:37 +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 9daf934426 QskLayoutElement introduced 2022-08-06 15:41:32 +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 be53343375 do not align to scene coordinates for transformations beyond
translations
2022-08-03 09:39:15 +02:00
Peter Hartmann 8bbc14b02b stack box: Add cube effect 2022-08-03 08:23:20 +02:00
Uwe Rathmann 83c9837e6a dead member definitions removed 2022-07-29 11:21:12 +02:00
Uwe Rathmann 6c778c4b07 qskAlignedRect overloads 2022-07-28 16:51:20 +02:00
Uwe Rathmann c67a594d07 whitespaces removed 2022-07-28 16:50:55 +02:00
Uwe Rathmann 2737bc0be3 sourceSize members replaced by strutSizeHints to make icons sizes
configurable in the skin
2022-07-28 11:37:14 +02:00
Uwe Rathmann 5db2f636f3 using radians isntead of degrees 2022-07-25 18:51:07 +02:00
Uwe Rathmann b6031f4703 some improvememts for stack box flipping 2022-07-25 18:42:18 +02:00
Uwe Rathmann 168b8be9d0 flipping QskStackBoxAnimator added 2022-07-19 16:50:40 +02:00
Uwe Rathmann cb6ec8437c QskPushButtonSkinlet::rippleRect simplified 2022-07-18 16:40:53 +02:00
Uwe Rathmann 55b2235d18 lineCount fixed ( clip nodes ended up with a final line with random
coordinates )
2022-07-18 16:27:22 +02:00
Uwe Rathmann d7d90a9dc8 using QskSGNode::ensureNode 2022-07-18 16:26:49 +02:00
Uwe Rathmann 9fdaf8aef6 clipping the ripple into the button panel 2022-07-18 09:11:45 +02:00
Uwe Rathmann 0390166783 using built in QskHintAnimators 2022-07-17 16:01:46 +02:00
Uwe Rathmann 0a6ed7deb1 aspect resolving of animated values fixed ( placement/section bits ) 2022-07-17 15:59:53 +02:00
Uwe Rathmann e6fb38d383 minor cleanups 2022-07-17 14:44:19 +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
Peter Hartmann 07e3cf7fd6 Add top level application view 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
Uwe Rathmann 209fbaef97 keep upper case letters for skin names 2022-07-14 13:55:35 +02:00
Uwe Rathmann 5f4a8aae6d Merge branch 'material-theme' of https://github.com/edelhirsch/qskinny into edelhirsch-material-theme 2022-07-07 08:42:59 +02:00
Uwe Rathmann d89adc4459 Qtcalculations only for Qt::MinimumSize 2022-07-07 08:39:29 +02:00
Peter Hartmann f6a4e8d2d6 QskSubWindow: Respect minimum size
E.g. Material 3 dialogs have a minimum size
2022-07-07 08:20:31 +02:00
Peter Hartmann 9ecafddc49 Slider: Add ripple and style it 2022-07-05 13:41:18 +02:00
Peter Hartmann 2129e235b7 remove leftover change in segmented bar 2022-07-05 09:52:03 +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
Uwe Rathmann f7cd259fb0 using QskSkin::symbol for the indicator 2022-07-01 12:40:52 +02:00
Uwe Rathmann 5545d124e8 CheckMark, CrossMark symbols introduced 2022-07-01 12:39:28 +02:00
Uwe Rathmann f06e47613a QskGraphic::fraomGraphic introduced 2022-07-01 12:37:58 +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
Uwe Rathmann 05857418f1 Merge branch 'master' of https://github.com/uwerat/qskinny 2022-06-29 16:16:07 +02:00
Uwe Rathmann 62fcbc6c32 QskAspect::Section introduced 2022-06-29 16:15:38 +02:00
Uwe 6cbc0595e1 avoid pointless gcc11 stringop-overflow warnings 2022-06-28 09:20:22 +02:00
Peter Hartmann 6332a27764 fix build after merge 2022-06-27 14:50:54 +02:00
Peter Hartmann 212090f62a Merge branch 'uwerat-master' into material-theme 2022-06-27 14:00:13 +02:00
Uwe Rathmann 44e264d472 returning an empty rect for the separator behind the last segment 2022-06-27 13:44:44 +02:00
Peter Hartmann 8ee9e8ed22 segmented bar: Add separator subcontrol 2022-06-27 13:31:17 +02:00
Peter Hartmann e7d05b5c98 segmented bar: Respect padding hint for graphic 2022-06-27 13:31:17 +02:00
Peter Hartmann 00b7df5b30 segmented bar: Don't constrain segment and cursor to inner box
In case we want to fill e.g. the cursor completely, we want to
access the contents rect. This means that it is our responsibility
to not draw beyond the panel.
2022-06-27 13:31:17 +02:00
Peter Hartmann bbaf7b2884 segmented bar: Add states for when cursor is at beginning and end
... so we can style the cursor accordingly
2022-06-27 13:31:17 +02:00
Uwe Rathmann d403af14ba making QskHctColor a class, tone calculation from rgb added 2022-06-27 12:54:13 +02:00
Peter Hartmann 879b4144b1 Merge branch 'uwerat-master' into material-theme 2022-06-27 10:35:49 +02:00
Uwe Rathmann d3c320bb9a Q_DECL_UNUSED removed, seems to cause problems on Macs 2022-06-26 14:33:39 +02:00
Uwe Rathmann e8f52c03cc hacks for exposing definitions to QML are not needed anymore 2022-06-25 16:52:24 +02:00
Uwe Rathmann e787b15d35 wip 2022-06-25 16:38:42 +02:00
Uwe Rathmann 6c7ba0489c M(aterial)2 related code replaced 2022-06-25 16:14:08 +02:00
Uwe Rathmann 98368d42ac typos fixed 2022-06-25 16:10:00 +02:00
Uwe Rathmann 501a3ae07e RGB converter for the HCT color system introduced 2022-06-24 17:19:04 +02:00
Uwe Rathmann 061cdb0a07 minor improvements of the push button layout 2022-06-18 11:32:48 +02:00
Peter Hartmann c465676642 segmented bar: Add separator subcontrol 2022-06-17 12:49:27 +02:00
Peter Hartmann 8036d8ee69 Merge branch 'uwerat-master' into material-theme 2022-06-17 09:37:32 +02:00
Peter Hartmann e5880cf3ba segmented bar: Respect padding hint for graphic 2022-06-17 09:37:04 +02:00
Peter Hartmann a8fd90f5b1 segmented bar: Use QskAspect for the orientation
... to be able to style properly.
2022-06-17 09:37:04 +02:00
Peter Hartmann 79442019e4 segmented bar: Don't constrain segment and cursor to inner box
In case we want to fill e.g. the cursor completely, we want to
access the contents rect. This means that it is our responsibility
to not draw beyond the panel.
2022-06-17 09:37:04 +02:00
Peter Hartmann ed26bd3ab4 segmented bar: Add states for when cursor is at beginning and end
... so we can style the cursor accordingly
2022-06-17 09:37:04 +02:00
Uwe Rathmann 112221f123 only clip at the top border 2022-06-17 09:24:58 +02:00
Peter Hartmann d88edb3a02 Merge branch 'uwerat-master' into material-theme 2022-06-15 14:37:49 +02:00
Uwe Rathmann 54616a5781 missing Metric bit for spacings added 2022-06-15 11:38:07 +02:00
Uwe Rathmann 9fbcedfc2c Merge branch 'master' of https://github.com/uwerat/qskinny 2022-06-15 11:00:44 +02:00
Uwe Rathmann 824325eccf being more careful with setting the dirty bits of a QskBoxShadowNode 2022-06-15 10:59:39 +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
Uwe Rathmann 49bc726376 missing color update added 2022-06-14 12:03:33 +02:00
Uwe Rathmann 1e675e5b8c compare operators fixed, extra methods for offsetX/Y 2022-06-14 11:49:50 +02:00
Peter Hartmann 03512e03c0 Merge branch 'uwerat-master' into material-theme 2022-06-14 09:28:52 +02:00
Uwe Rathmann e554a125b2 Merge branch 'master' of https://github.com/uwerat/qskinny 2022-06-13 20:35:02 +02:00
Uwe Rathmann 2a2894a63f lost workaround forsituations, where multisampling gets lost, fixed 2022-06-13 20:34:12 +02:00
Peter Hartmann 264d53cb39
QskMenu: Respect graphic padding (#196)
We need some padding for e.g. the Material 3 style.
2022-06-13 17:18:47 +02:00
Peter Hartmann f53d0daeda Merge branch 'uwerat-master' into material-theme 2022-06-13 17:12:25 +02:00
Uwe Rathmann 1339a5f4cb shadows added to the box model 2022-06-13 17:01:15 +02:00
Peter Hartmann e6120baf15 QskMenu: Respect graphic padding
We need some padding for e.g. the Material 3 style.
2022-06-13 16:59:52 +02:00
Peter Hartmann 3df987894e Merge branch 'uwerat-master' into material-theme 2022-06-13 14:40:06 +02:00
Uwe Rathmann 1e1cf34829 setter/getter for shadow hints 2022-06-13 13:10:45 +02:00
Uwe Rathmann ff76f1ecfa removeChildNode added 2022-06-13 13:09:49 +02:00
Uwe Rathmann da21b95eb3 isNull added 2022-06-13 13:09:08 +02:00
Peter Hartmann 2340b21280 Merge branch 'uwerat-master' into material-theme 2022-06-13 09:50:27 +02:00
Uwe Rathmann f03007e7b8 QskShadowMetrics added to QskSkinHintTableEditor 2022-06-13 08:43:28 +02:00
Peter Hartmann e6b85e528b button: Add more states to cover different button types 2022-06-08 11:48:29 +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 c4dc6e8c2f Merge remote-tracking branch 'origin/master' into material-theme 2022-06-07 11:09:38 +02:00
Peter Hartmann 167965e12c
switch button: Fix size hint (#195)
This fixes a case where the Groove is bigger than the Handle, e.g.
with the Material 3 switch buttons.
2022-06-06 07:08:33 +02:00
Uwe Rathmann 0ed9afe2b4 QskBoxShadowNode introduced ( from playground/shadows )
- shader code migrated from glsl to vulkan-glsl
   - #ifdef "Geschnetzel" introduced to support old and rhi graphic APIs
   - iotdashboard, shadows examples adjusted
2022-06-04 17:56:14 +02:00
Peter Hartmann d456237feb switch button: Fix size hint
This fixes the case where the Groove is bigger than the Handle, e.g.
with the Material 3 switch buttons.
2022-06-03 17:28:16 +02:00
Peter Hartmann abc52e1bb8 Material: Switch palettes to Material 3
Also, remove the old Material 2 palettes, since the weights etc.
changed.
2022-06-02 18:25:12 +02:00
Uwe Rathmann a66d4645e8 Qt5 compiler error fixed 2022-06-02 16:15:25 +02:00
Uwe Rathmann c3c0b2cd33 bye, bye QskTextureNode 2022-06-02 16:09:49 +02:00
Uwe Rathmann 54b55c0324 default graphic pipeline without native OpenGL calls.
code is QRHI compiant now
2022-06-02 16:02:42 +02:00
Uwe Rathmann 5dc4200cdc typo fixed 2022-06-01 18:29:05 +02:00
Uwe Rathmann a35cc9936a mirroring added 2022-06-01 18:27:05 +02:00
Uwe Rathmann 86e438a0ed QFrameBufferObject::takeTexture also leaks with Qt 5.15 2022-06-01 17:50:16 +02:00
Uwe Rathmann 5ab536f0e3 fixed fot Qt5 2022-06-01 17:41:33 +02:00
Uwe Rathmann 86658ee2dc raster rendering does not solve the problems with the experimantel RHI
state in Qt5 ( no problems with Qt6 RHI and Qt5 without RHI )
2022-06-01 17:04:37 +02:00
Uwe Rathmann e1a58f84ee QskPaintedNode improved 2022-06-01 16:57:57 +02:00
Uwe Rathmann c291cde259 includes fixed 2022-06-01 16:51:11 +02:00