Commit Graph

1490 Commits

Author SHA1 Message Date
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
Uwe Rathmann c64d386477 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 8593a5cf2e 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 dae4ee02d5 deprecation warnings fixed 2022-05-02 16:51:24 +02:00
Peter Hartmann 13ff41722c
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 9f706beab1 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 bce7d6e1dc unused lambda capture removed 2022-04-22 08:39:01 +02:00
Uwe Rathmann 019a6899db avoid conflicts with RGB from wingdi.h 2022-04-22 08:21:20 +02:00
Uwe Rathmann 8e0008cf59 Merge branch 'master' of https://github.com/uwerat/qskinny 2022-04-22 08:13:44 +02:00
Uwe Rathmann 8680423c33 avoid warnings about narrowing size_t to int 2022-04-22 08:13:19 +02:00
Uwe Rathmann 4e0d1197da handling of devicePixelratio for pixmaps fixed 2022-04-21 13:08:50 +02:00
Uwe Rathmann 12a3dd06da boilerplate code to have QskSegmentedBar in the gallery. 2022-04-20 15:25:15 +02:00
Uwe Rathmann 8f04d21739 formal adjustments 2022-04-20 14:20:41 +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 22060f6aaf missing moc include 2022-04-20 13:54:27 +02:00
Uwe Rathmann d011d5d1ea all node role enums should have RoleCount 2022-04-20 13:50:14 +02:00
Uwe Rathmann df31b57e7c Qsk::Position removed ( Qt::Edge is good enough ) 2022-04-17 13:19:33 +02:00
Uwe Rathmann d0b926b868 using Qt::Edge instead of Qsk::Position 2022-04-17 12:37:13 +02:00
Uwe Rathmann e514b659e8 resetPlacementPolicy added 2022-04-16 20:38:50 +02:00
Uwe Rathmann 896e33bf77 moc include added 2022-04-16 20:38:06 +02:00
Uwe Rathmann 09a12fc7a8 pre Qt 5.15 code removed 2022-04-16 17:02:53 +02:00
Uwe Rathmann 1f0ad384ac dropping support for Qt < 5.15 2022-04-16 16:29:58 +02:00
Uwe Rathmann ab095afb13 using left/top/right/bottom 2022-04-16 16:01:40 +02:00
Uwe Rathmann 628e57a9ff obsolete comment removed 2022-04-16 16:00:19 +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 c4f5a4bc93 compiler error fixed 2022-04-16 11:32:51 +02:00
Uwe Rathmann 6dd3b44f52 placementPolicy as property 2022-04-15 13:19:52 +02:00
Uwe Rathmann bf37fe000c using QMetaObject instead of QTimer for delayed calls 2022-04-14 08:26:49 +02:00
Peter Hartmann 7693c8d911
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 a1d60803f2 avoid crash with vnc plugin 2022-04-11 12:05:00 +02:00
Uwe Rathmann dc14dda5ea respecting the graphicsApi 2022-04-11 10:11:57 +02:00
Uwe Rathmann a73ee6baba 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 69e4152b4c QskPlacementPolicy introduced 2022-04-08 16:46:20 +02:00
Uwe Rathmann 449f08bf98 beautified 2022-04-08 15:37:55 +02:00
Uwe Rathmann 21ad84e291 Qsk::Visibility added 2022-04-08 15:37:32 +02:00
Uwe Rathmann eaf57ef1f0 project file fixed 2022-04-07 17:45:38 +02:00
Uwe Rathmann 741af6a8a6 hiding isTransparentForPositioner 2022-04-07 17:19:59 +02:00
Uwe Rathmann c17e3defd3 qskItemSize() removed, QQuickItem::size() is available since Qt 5.10 2022-04-07 15:43:45 +02:00
Uwe Rathmann c44c30fa41 forgotten debug statement removed 2022-04-06 10:56:48 +02:00
Uwe Rathmann 676e0d5e9f colorswitch example removed 2022-04-06 08:41:32 +02:00