Commit Graph

1364 Commits

Author SHA1 Message Date
Peter Hartmann 33d601befd Revert "QskPushButton: respect the graphics alignment"
This reverts commit 3c69498026.
2022-06-15 10:57:36 +02:00
Peter Hartmann be360c729c 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 b8502524ff missing color update added 2022-06-14 12:03:33 +02:00
Uwe Rathmann 2b2da9dac2 compare operators fixed, extra methods for offsetX/Y 2022-06-14 11:49:50 +02:00
Peter Hartmann 1d586d2791 Merge branch 'uwerat-master' into material-theme 2022-06-14 09:28:52 +02:00
Uwe Rathmann e1ebc06f09 Merge branch 'master' of https://github.com/uwerat/qskinny 2022-06-13 20:35:02 +02:00
Uwe Rathmann 5a2dcfedfc lost workaround forsituations, where multisampling gets lost, fixed 2022-06-13 20:34:12 +02:00
Peter Hartmann a44c3a1e4e 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 bde5d8f59f Merge branch 'uwerat-master' into material-theme 2022-06-13 17:12:25 +02:00
Uwe Rathmann 3a22880778 shadows added to the box model 2022-06-13 17:01:15 +02:00
Peter Hartmann 1bcb6a18aa 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 1ae1b76dd5 Merge branch 'uwerat-master' into material-theme 2022-06-13 14:40:06 +02:00
Uwe Rathmann 6b04e8d3ea setter/getter for shadow hints 2022-06-13 13:10:45 +02:00
Uwe Rathmann ee2b5e891f removeChildNode added 2022-06-13 13:09:49 +02:00
Uwe Rathmann 4920c66640 isNull added 2022-06-13 13:09:08 +02:00
Peter Hartmann 3f65bfb68e Merge branch 'uwerat-master' into material-theme 2022-06-13 09:50:27 +02:00
Uwe Rathmann 57feb5aae3 QskShadowMetrics added to QskSkinHintTableEditor 2022-06-13 08:43:28 +02:00
Peter Hartmann 24bff6d64d button: Add more states to cover different button types 2022-06-08 11:48:29 +02:00
Peter Hartmann 769e88d1d5 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 a01e03622a Merge remote-tracking branch 'origin/master' into material-theme 2022-06-07 11:09:38 +02:00
Peter Hartmann c2bc787087 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 a145bd9207 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 0497382b57 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 0299217762 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 8a8d6639fc Qt5 compiler error fixed 2022-06-02 16:15:25 +02:00
Uwe Rathmann 4124985f7d bye, bye QskTextureNode 2022-06-02 16:09:49 +02:00
Uwe Rathmann 9af48dfba0 default graphic pipeline without native OpenGL calls.
code is QRHI compiant now
2022-06-02 16:02:42 +02:00
Uwe Rathmann 5dd6d0b747 typo fixed 2022-06-01 18:29:05 +02:00
Uwe Rathmann 4cb9f84c0a mirroring added 2022-06-01 18:27:05 +02:00
Uwe Rathmann 1d4a624700 QFrameBufferObject::takeTexture also leaks with Qt 5.15 2022-06-01 17:50:16 +02:00
Uwe Rathmann fa611251f3 fixed fot Qt5 2022-06-01 17:41:33 +02:00
Uwe Rathmann ab721c7b3c 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 294081c700 QskPaintedNode improved 2022-06-01 16:57:57 +02:00
Uwe Rathmann 7237ad65c9 includes fixed 2022-06-01 16:51:11 +02:00
Uwe Rathmann fc88e450ed QskPaintedNode reimplemented to work with RHI and software renderer
Code will be moved in parts to QskTextureRenderer to do something
similar with QskTextureNode.
2022-05-31 17:56:49 +02:00
Uwe Rathmann cecc412128 hide QskGraphicNode, QskTextNode in QskSkinlet, where possible.
We will have less dependencies, when moving QskGraphicNode to something
that works better with the QRhi abstraction
2022-05-30 15:16:46 +02:00
Uwe Rathmann 3aed2368fa deprecation warnings fixed 2022-05-02 16:51:24 +02:00
Peter Hartmann 7889f53a02 Windows: Fix placement policy of all items (#188)
Before, on Windows nothing would be displayed because of the
following error:

implicit truncation from 'QskPlacementPolicy::Policy' to bit-field
changes value from 2 to -2
2022-05-02 16:05:58 +02:00
Uwe Rathmann d8518e1d6c iconst keywords removed to avoid clang warnings about implicitely
deleted functions. But do we really need QSK_EVENT_DISABLE_COPY ?
2022-04-22 09:00:26 +02:00
Uwe Rathmann 0354121199 unused lambda capture removed 2022-04-22 08:39:01 +02:00
Uwe Rathmann 293499db23 avoid conflicts with RGB from wingdi.h 2022-04-22 08:21:20 +02:00
Uwe Rathmann 73e35090a2 Merge branch 'master' of https://github.com/uwerat/qskinny 2022-04-22 08:13:44 +02:00
Uwe Rathmann 9e79657a78 avoid warnings about narrowing size_t to int 2022-04-22 08:13:19 +02:00
Uwe Rathmann b13f15823c handling of devicePixelratio for pixmaps fixed 2022-04-21 13:08:50 +02:00
Uwe Rathmann 5fa323cb3f boilerplate code to have QskSegmentedBar in the gallery. 2022-04-20 15:25:15 +02:00
Uwe Rathmann 2444e95f93 formal adjustments 2022-04-20 14:20:41 +02:00
Uwe Rathmann 410a00e89b QskSegmentedBar ( inspired by the IOS segmented control ) added 2022-04-20 14:14:37 +02:00
Uwe Rathmann 29421138ab suing QskMenu::Segement instead of Qskmenu::Cell to be in line with other
controls
2022-04-20 13:58:53 +02:00
Uwe Rathmann e38c2451e0 missing moc include 2022-04-20 13:54:27 +02:00
Uwe Rathmann eb5eb60216 all node role enums should have RoleCount 2022-04-20 13:50:14 +02:00
Uwe Rathmann 357dd9b68c Qsk::Position removed ( Qt::Edge is good enough ) 2022-04-17 13:19:33 +02:00
Uwe Rathmann e0f7397eb7 using Qt::Edge instead of Qsk::Position 2022-04-17 12:37:13 +02:00
Uwe Rathmann 905d2485f3 resetPlacementPolicy added 2022-04-16 20:38:50 +02:00
Uwe Rathmann 894491fda8 moc include added 2022-04-16 20:38:06 +02:00
Uwe Rathmann b12925d171 pre Qt 5.15 code removed 2022-04-16 17:02:53 +02:00
Uwe Rathmann 099890543b dropping support for Qt < 5.15 2022-04-16 16:29:58 +02:00
Uwe Rathmann b64084a561 using left/top/right/bottom 2022-04-16 16:01:40 +02:00
Uwe Rathmann 729b39ee13 obsolete comment removed 2022-04-16 16:00:19 +02:00
Uwe Rathmann 870cfbd27d heuristic for initializing the cascading property moved from skin to
QskMenu
2022-04-16 12:25:39 +02:00
Uwe Rathmann 95a88a7cdb compiler error fixed 2022-04-16 11:32:51 +02:00
Uwe Rathmann 0a6a3e6c5e placementPolicy as property 2022-04-15 13:19:52 +02:00
Uwe Rathmann 9c8c588245 using QMetaObject instead of QTimer for delayed calls 2022-04-14 08:26:49 +02:00
Peter Hartmann 94a186b553 fix build on Windows (#176)
* fix build on Windows

fixes the following error from CI:

common\QskAspect.cpp(199): error C2666: 'QFlags<QskAspect::State>::operator &': 3 overloads have similar conversions
D:\a\qskinny\Qt\5.15.2\msvc2019_64\include\QtCore/qflags.h(146): note: could be 'QFlags<QskAspect::State> QFlags<QskAspect::State>::operator &(Enum) noexcept const'
        with
        [
            Enum=QskAspect::State
        ]
D:\a\qskinny\Qt\5.15.2\msvc2019_64\include\QtCore/qflags.h(145): note: or       'QFlags<QskAspect::State> QFlags<QskAspect::State>::operator &(uint) noexcept const'
D:\a\qskinny\Qt\5.15.2\msvc2019_64\include\QtCore/qflags.h(144): note: or       'QFlags<QskAspect::State> QFlags<QskAspect::State>::operator &(int) noexcept const'
common\QskAspect.cpp(199): note: or       'built-in C++ operator&(QFlags<QskAspect::State>::Int, quint16)'
common\QskAspect.cpp(199): note: while trying to match the argument list '(QskAspect::States, const quint16)'

* fix build on Windows

fixes the following error from CI:

C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.31.31103\include\memory(3124): error C2027: use of undefined type 'QskMenuSkinlet::PrivateData'
D:\a\qskinny\qskinny\src\controls\QskMenuSkinlet.h(54): note: see declaration of 'QskMenuSkinlet::PrivateData'
C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.31.31103\include\memory(3123): note: while compiling class template member function 'void std::default_delete<QskMenuSkinlet::PrivateData>::operator ()(_Ty *) noexcept const'
        with
        [
            _Ty=QskMenuSkinlet::PrivateData
        ]
C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.31.31103\include\memory(3233): note: see reference to function template instantiation 'void std::default_delete<QskMenuSkinlet::PrivateData>::operator ()(_Ty *) noexcept const' being compiled
        with
        [
            _Ty=QskMenuSkinlet::PrivateData
        ]
C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.31.31103\include\memory(3160): note: see reference to class template instantiation 'std::default_delete<QskMenuSkinlet::PrivateData>' being compiled
D:\a\qskinny\qskinny\src\controls\QskMenuSkinlet.h(55): note: see reference to class template instantiation 'std::unique_ptr<QskMenuSkinlet::PrivateData,std::default_delete<QskMenuSkinlet::PrivateData>>' being compiled
C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.31.31103\include\memory(3124): error C2338: can't delete an incomplete type
C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.31.31103\include\memory(3125): warning C4150: deletion of pointer to incomplete type 'QskMenuSkinlet::PrivateData'; no destructor called
D:\a\qskinny\qskinny\src\controls\QskMenuSkinlet.h(54): note: see declaration of 'QskMenuSkinlet::PrivateData
2022-04-13 11:24:18 +02:00
Uwe Rathmann 0ff98f9532 avoid crash with vnc plugin 2022-04-11 12:05:00 +02:00
Uwe Rathmann e747b59514 respecting the graphicsApi 2022-04-11 10:11:57 +02:00
Uwe Rathmann bd5eb47439 Squashed commit of the following:
commit e2887cdc9d7cbf69445c325fe074578e2f38da6c
Author: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date:   Mon Apr 11 09:58:03 2022 +0200

    wip

commit 63efe9f3ad95fdf3d9fb15c929a45b0dc7cc681c
Author: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date:   Mon Apr 11 09:39:18 2022 +0200

    wip

commit a2f3621fb6fea787f32c53428eee26f30c69510c
Author: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date:   Mon Apr 11 08:04:11 2022 +0200

    wip
2022-04-11 10:01:24 +02:00
Uwe Rathmann 8b362edb29 QskPlacementPolicy introduced 2022-04-08 16:46:20 +02:00
Uwe Rathmann d12bfe014b beautified 2022-04-08 15:37:55 +02:00
Uwe Rathmann eca1ada982 Qsk::Visibility added 2022-04-08 15:37:32 +02:00
Uwe Rathmann b28c7d815f project file fixed 2022-04-07 17:45:38 +02:00
Uwe Rathmann b4fdd468e1 hiding isTransparentForPositioner 2022-04-07 17:19:59 +02:00
Uwe Rathmann 35f98bedbb qskItemSize() removed, QQuickItem::size() is available since Qt 5.10 2022-04-07 15:43:45 +02:00
Uwe Rathmann d9c2227f5c forgotten debug statement removed 2022-04-06 10:56:48 +02:00
Uwe Rathmann 5791a9f6e4 colorswitch example removed 2022-04-06 08:41:32 +02:00
Uwe Rathmann f91bcdaa76 sending a second StyleChange once the transition is done 2022-04-05 15:31:17 +02:00
Uwe Rathmann bf6afd15a9 wip 2022-04-05 11:38:23 +02:00
Uwe Rathmann f0aded9fe1 wip 2022-04-05 10:41:36 +02:00
Uwe Rathmann 9d2e517036 QskCheckBox improvements 2022-04-05 10:15:08 +02:00
Uwe Rathmann cd9211c241 QskCheckBox improvements 2022-04-05 08:48:16 +02:00
Uwe Rathmann 29dbaa2189 the geometry for the tick can change 2022-04-04 18:32:17 +02:00
Uwe Rathmann 94269b0206 spelling aligned with Qt checkboxes ( triState -> tristate ) 2022-04-04 14:39:24 +02:00
Uwe Rathmann c7388cb730 formal cheges, check box added to gallery 2022-04-04 14:14:07 +02:00
Clemens Manert cdf062e5bd 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 5a5ad5ddd9 stop animation, when start/endValues are chaged. Otherwise we will run
into crashes, when value types have not been aligned or can't be aligned
2022-04-03 16:32:04 +02:00
Uwe Rathmann a3e07ed417 only check if types do match without doing the conversion 2022-04-03 16:31:54 +02:00
Uwe Rathmann fa0659b575 Q_DECLARE_TYPEINFO fixed 2022-04-03 16:31:34 +02:00
Uwe Rathmann eec8c71ebc compiler error fixed 2022-04-01 17:00:05 +02:00
Uwe Rathmann 919b8ba21d font initialization changed 2022-04-01 14:42:18 +02:00
Uwe Rathmann e2238690e0 using c++11 2022-04-01 14:41:56 +02:00
Uwe Rathmann 89bd7a35ef skin transition heavily changed 2022-03-31 18:09:03 +02:00
Uwe Rathmann 1084609db2 using QVariant::metaType 2022-03-31 12:25:24 +02:00
Uwe Rathmann 17aedfb216 QMetaType definitions added 2022-03-30 18:30:22 +02:00
Uwe Rathmann 0067ed2d8b QskStateCombination operators added 2022-03-30 18:21:31 +02:00
Uwe Rathmann 326783e4df debug operators improved 2022-03-30 12:28:45 +02:00
Uwe Rathmann e772d40350 try to convert if start/end values have different types 2022-03-29 11:15:08 +02:00
Uwe Rathmann b3ed43dc96 interpolation between monochrome gradients improved 2022-03-29 11:14:23 +02:00
Uwe Rathmann 048835a618 using qskEffectiveSkin 2022-03-29 08:09:19 +02:00
Uwe Rathmann 1d4cc69223 making hintTable() public 2022-03-29 08:08:46 +02:00
Uwe Rathmann 3b7a892424 qHash added 2022-03-29 08:08:06 +02:00
Uwe Rathmann cefe16ca28 tracking states of the aspects in a QskSkinHintTable 2022-03-28 21:28:56 +02:00