diff --git a/LICENSES b/LICENSES index af85ab72..92682268 100644 --- a/LICENSES +++ b/LICENSES @@ -19,3 +19,8 @@ b) Cassowary constraint solving algorithm Code: https://github.com/nucleic/kiwi SPDX-License-Identifier: BSD 3-Clause "New" or "Revised" License Copyright (c) 2013, Nucleic Development Team + +c) Material3 Icons + + Code: https://github.com/marella/material-design-icons + SPDX-License-Identifier: Apache License 2.0 diff --git a/designsystems/material3/QskMaterial3Skin.cpp b/designsystems/material3/QskMaterial3Skin.cpp index 033e5a88..9e2835b4 100644 --- a/designsystems/material3/QskMaterial3Skin.cpp +++ b/designsystems/material3/QskMaterial3Skin.cpp @@ -105,6 +105,15 @@ namespace return qskDpToPixels( value ); } + class Combination : public QskStateCombination + { + public: + constexpr Combination( const QskAspect::States states ) + : QskStateCombination( CombinationNoState, states ) + { + } + }; + class Editor : private QskSkinHintTableEditor { Q_GADGET @@ -585,7 +594,7 @@ void Editor::setupSegmentedBar() { // Icon - setSymbol( Q::Icon, symbol( "segmented-button-check" ) ); + setSymbol( Q::Icon, symbol( "check" ) ); setStrutSize( Q::Icon, 18_dp, 18_dp ); setGraphicRole( Q::Icon, QskMaterial3Skin::GraphicRoleOnSurface ); @@ -881,6 +890,15 @@ void Editor::setupSpinBox() using Q = QskSpinBox; setHint( Q::Panel | QskAspect::Style, Q::ButtonsLeftAndRight ); + + setBoxShape( Q::Panel, 4_dp ); + setBoxBorderMetrics( Q::Panel, 1_dp ); + + setBoxBorderColors( Q::Panel, m_pal.outline ); + setBoxBorderColors( Q::Panel | Q::Focused, m_pal.primary, + Combination( { Q::Increasing, Q::Decreasing } ) ); + + setPadding( Q::Panel, 4_dp ); setSpacing( Q::Panel, 4_dp ); setStrutSize( Q::TextPanel, 80_dp, 40_dp ); @@ -897,31 +915,31 @@ void Editor::setupSpinBox() for( const auto subControl : { Q::DownPanel, Q::UpPanel } ) { - setGradient( subControl, m_pal.primary ); - setGradient( subControl | Q::Disabled, m_pal.onSurface12 ); + setGradient( subControl | Q::Hovered, m_pal.primary8 ); setPadding( subControl, 10 ); } { - const auto focusColor = flattenedColor( m_pal.onPrimary, m_pal.primary, 0.12 ); - - setGradient( Q::DownPanel | Q::Decreasing, focusColor ); - setGradient( Q::UpPanel | Q::Increasing, focusColor ); + setGradient( Q::DownPanel | Q::Decreasing, m_pal.primary12 ); + setGradient( Q::UpPanel | Q::Increasing, m_pal.primary12 ); } - setSymbol( Q::UpIndicator, symbol( "combo-box-arrow-open" ) ); - setSymbol( Q::DownIndicator, symbol( "combo-box-arrow-closed" ) ); + setSymbol( Q::UpIndicator, symbol( "add" ) ); + setSymbol( Q::DownIndicator, symbol( "remove" ) ); for( const auto subControl : { Q::DownIndicator, Q::UpIndicator } ) { setAlignment( subControl, Qt::AlignCenter ); +#if 0 setGraphicRole( subControl, QskMaterial3Skin::GraphicRoleOnPrimary ); setGraphicRole( subControl | Q::Disabled, QskMaterial3Skin::GraphicRoleOnSurface38 ); +#endif } setColor( Q::Text, m_pal.onBackground ); setColor( Q::Text | Q::Disabled, m_pal.onSurface38 ); +#if 0 setPadding( Q::TextPanel, 5_dp ); setBoxShape( Q::TextPanel, 4_dp, 4_dp, 0, 0 ); setBoxBorderMetrics( Q::TextPanel, 0, 0, 0, 1_dp ); @@ -938,6 +956,7 @@ void Editor::setupSpinBox() setColor( Q::TextPanel | Q::Disabled, m_pal.onSurface38 ); setBoxBorderColors( Q::TextPanel | Q::Disabled, m_pal.onSurface38 ); +#endif } void Editor::setupSwitchButton() diff --git a/designsystems/material3/icons.qrc b/designsystems/material3/icons.qrc index ab149d96..4e55e3be 100644 --- a/designsystems/material3/icons.qrc +++ b/designsystems/material3/icons.qrc @@ -1,8 +1,19 @@ + + + icons/qvg/check_small.qvg icons/qvg/combo-box-arrow-closed.qvg icons/qvg/combo-box-arrow-open.qvg icons/qvg/segmented-button-check.qvg + + + + icons/qvg/add.qvg + icons/qvg/arrow_drop_down.qvg + icons/qvg/arrow_drop_up.qvg + icons/qvg/check.qvg + icons/qvg/remove.qvg diff --git a/designsystems/material3/icons/LICENSE b/designsystems/material3/icons/LICENSE new file mode 100644 index 00000000..d6456956 --- /dev/null +++ b/designsystems/material3/icons/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/designsystems/material3/icons/add.svg b/designsystems/material3/icons/add.svg new file mode 100644 index 00000000..b0570646 --- /dev/null +++ b/designsystems/material3/icons/add.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/designsystems/material3/icons/arrow_drop_down.svg b/designsystems/material3/icons/arrow_drop_down.svg new file mode 100644 index 00000000..37d90c90 --- /dev/null +++ b/designsystems/material3/icons/arrow_drop_down.svg @@ -0,0 +1 @@ + diff --git a/designsystems/material3/icons/arrow_drop_up.svg b/designsystems/material3/icons/arrow_drop_up.svg new file mode 100644 index 00000000..24f0831a --- /dev/null +++ b/designsystems/material3/icons/arrow_drop_up.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/designsystems/material3/icons/check.svg b/designsystems/material3/icons/check.svg new file mode 100644 index 00000000..3be223be --- /dev/null +++ b/designsystems/material3/icons/check.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/designsystems/material3/icons/qvg/add.qvg b/designsystems/material3/icons/qvg/add.qvg new file mode 100644 index 00000000..f347bbd2 Binary files /dev/null and b/designsystems/material3/icons/qvg/add.qvg differ diff --git a/designsystems/material3/icons/qvg/arrow_drop_down.qvg b/designsystems/material3/icons/qvg/arrow_drop_down.qvg new file mode 100644 index 00000000..e8de8a68 Binary files /dev/null and b/designsystems/material3/icons/qvg/arrow_drop_down.qvg differ diff --git a/designsystems/material3/icons/qvg/arrow_drop_up.qvg b/designsystems/material3/icons/qvg/arrow_drop_up.qvg new file mode 100644 index 00000000..792f219a Binary files /dev/null and b/designsystems/material3/icons/qvg/arrow_drop_up.qvg differ diff --git a/designsystems/material3/icons/qvg/check.qvg b/designsystems/material3/icons/qvg/check.qvg new file mode 100644 index 00000000..882d62f5 Binary files /dev/null and b/designsystems/material3/icons/qvg/check.qvg differ diff --git a/designsystems/material3/icons/qvg/remove.qvg b/designsystems/material3/icons/qvg/remove.qvg new file mode 100644 index 00000000..ecc0bc2a Binary files /dev/null and b/designsystems/material3/icons/qvg/remove.qvg differ diff --git a/designsystems/material3/icons/remove.svg b/designsystems/material3/icons/remove.svg new file mode 100644 index 00000000..9fa856a5 --- /dev/null +++ b/designsystems/material3/icons/remove.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/controls/QskSpinBoxSkinlet.cpp b/src/controls/QskSpinBoxSkinlet.cpp index a9afc159..3af7272c 100644 --- a/src/controls/QskSpinBoxSkinlet.cpp +++ b/src/controls/QskSpinBoxSkinlet.cpp @@ -131,11 +131,11 @@ QRectF QskSpinBoxSkinlet::textPanelRect( auto spinBox = static_cast< const QskSpinBox* >( skinnable ); + auto r = spinBox->innerBox( Q::Panel, rect ); + const auto decoration = spinBox->decoration(); if ( decoration == Q::NoDecoration ) - return rect; - - auto r = rect; + return r; const auto spacing = spinBox->spacingHint( Q::Panel ); @@ -170,12 +170,14 @@ QRectF QskSpinBoxSkinlet::textPanelRect( } QRectF QskSpinBoxSkinlet::buttonRect( const QskSkinnable* skinnable, - const QRectF& rect, QskAspect::Subcontrol subControl ) const + const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const { using Q = QskSpinBox; const auto spinBox = static_cast< const QskSpinBox* >( skinnable ); + const auto rect = spinBox->innerBox( Q::Panel, contentsRect ); + if ( const auto decoration = spinBox->decoration() ) { qreal x, y, w, h; @@ -208,7 +210,7 @@ QRectF QskSpinBoxSkinlet::buttonRect( const QskSkinnable* skinnable, if( subControl == Q::UpPanel ) { - const auto downRect = buttonRect( skinnable, rect, Q::DownPanel ); + const auto downRect = subControlRect( skinnable, contentsRect, Q::DownPanel ); x = downRect.left() - w; } else @@ -216,7 +218,7 @@ QRectF QskSpinBoxSkinlet::buttonRect( const QskSkinnable* skinnable, x = rect.right() - w; } - y = 0.5 * ( rect.height() - h ); + y = rect.top() + 0.5 * ( rect.height() - h ); } else { @@ -231,7 +233,7 @@ QRectF QskSpinBoxSkinlet::buttonRect( const QskSkinnable* skinnable, w = h; x = ( subControl == Q::UpPanel ) ? rect.right() - w : rect.left(); - y = 0.5 * ( rect.height() - h ); + y = rect.top() + 0.5 * ( rect.height() - h ); } return QRectF( x, y, w, h ); @@ -304,7 +306,9 @@ QSizeF QskSpinBoxSkinlet::sizeHint( const QskSkinnable* skinnable, } } + hint = hint.grownBy( spinBox->paddingHint( Q::Panel ) ); hint = hint.expandedTo( spinBox->strutSizeHint( Q::Panel ) ); + return hint; }