From 0afecc4b9e0859166992f5650691180243b28739 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Tue, 23 Apr 2024 15:36:07 +0200 Subject: [PATCH] using icons from https://github.com/microsoft/fluentui-system-icons/tree/main/assets --- designsystems/fluent2/QskFluent2Icons.qrc | 7 +--- designsystems/fluent2/QskFluent2Skin.cpp | 39 +++++++++++------- designsystems/fluent2/icons/README | 10 +++++ designsystems/fluent2/icons/checkmark.svg | 5 +-- designsystems/fluent2/icons/chevron_down.svg | 3 ++ designsystems/fluent2/icons/chevron_up.svg | 3 ++ .../fluent2/icons/combo-box-arrow-closed.svg | 4 -- .../fluent2/icons/combo-box-arrow-open.svg | 4 -- designsystems/fluent2/icons/qvg/checkmark.qvg | Bin 1287 -> 867 bytes .../fluent2/icons/qvg/chevron_down.qvg | Bin 0 -> 867 bytes .../fluent2/icons/qvg/chevron_up.qvg | Bin 0 -> 867 bytes .../icons/qvg/combo-box-arrow-closed.qvg | Bin 547 -> 0 bytes .../icons/qvg/combo-box-arrow-open.qvg | Bin 691 -> 0 bytes .../icons/qvg/segmented-button-check.qvg | Bin 607 -> 0 bytes .../fluent2/icons/qvg/spin-box-arrow-down.qvg | Bin 1167 -> 0 bytes .../fluent2/icons/qvg/spin-box-arrow-up.qvg | Bin 1167 -> 0 bytes .../fluent2/icons/segmented-button-check.svg | 4 -- .../fluent2/icons/spin-box-arrow-down.svg | 4 -- .../fluent2/icons/spin-box-arrow-up.svg | 4 -- 19 files changed, 43 insertions(+), 44 deletions(-) create mode 100644 designsystems/fluent2/icons/README create mode 100644 designsystems/fluent2/icons/chevron_down.svg create mode 100644 designsystems/fluent2/icons/chevron_up.svg delete mode 100644 designsystems/fluent2/icons/combo-box-arrow-closed.svg delete mode 100644 designsystems/fluent2/icons/combo-box-arrow-open.svg create mode 100644 designsystems/fluent2/icons/qvg/chevron_down.qvg create mode 100644 designsystems/fluent2/icons/qvg/chevron_up.qvg delete mode 100644 designsystems/fluent2/icons/qvg/combo-box-arrow-closed.qvg delete mode 100644 designsystems/fluent2/icons/qvg/combo-box-arrow-open.qvg delete mode 100644 designsystems/fluent2/icons/qvg/segmented-button-check.qvg delete mode 100644 designsystems/fluent2/icons/qvg/spin-box-arrow-down.qvg delete mode 100644 designsystems/fluent2/icons/qvg/spin-box-arrow-up.qvg delete mode 100644 designsystems/fluent2/icons/segmented-button-check.svg delete mode 100644 designsystems/fluent2/icons/spin-box-arrow-down.svg delete mode 100644 designsystems/fluent2/icons/spin-box-arrow-up.svg diff --git a/designsystems/fluent2/QskFluent2Icons.qrc b/designsystems/fluent2/QskFluent2Icons.qrc index 4e322fd8..7587fb4c 100644 --- a/designsystems/fluent2/QskFluent2Icons.qrc +++ b/designsystems/fluent2/QskFluent2Icons.qrc @@ -1,10 +1,7 @@ icons/qvg/checkmark.qvg - icons/qvg/combo-box-arrow-closed.qvg - icons/qvg/combo-box-arrow-open.qvg - icons/qvg/segmented-button-check.qvg - icons/qvg/spin-box-arrow-down.qvg - icons/qvg/spin-box-arrow-up.qvg + icons/qvg/chevron_down.qvg + icons/qvg/chevron_up.qvg diff --git a/designsystems/fluent2/QskFluent2Skin.cpp b/designsystems/fluent2/QskFluent2Skin.cpp index 993a3dcf..3ccb3bc2 100644 --- a/designsystems/fluent2/QskFluent2Skin.cpp +++ b/designsystems/fluent2/QskFluent2Skin.cpp @@ -419,7 +419,6 @@ void Editor::setupCheckBoxMetrics() setStrutSize( Q::Box, { 20_px, 20_px } ); // 18 + 2*1 border setBoxShape( Q::Box, 4_px ); // adapt to us taking the border into account setBoxBorderMetrics( Q::Box, 1_px ); - setPadding( Q::Box, 5_px ); // "icon size" setFontRole( Q::Text, Fluent2::Body ); } @@ -548,9 +547,9 @@ void Editor::setupComboBoxMetrics() setAlignment( Q::Text, Qt::AlignLeft | Qt::AlignVCenter ); setFontRole( Q::Text, Fluent2::Body ); - setStrutSize( Q::StatusIndicator, 12_px, 12_px ); - setSymbol( Q::StatusIndicator, symbol( "spin-box-arrow-down" ) ); - setSymbol( Q::StatusIndicator | Q::PopupOpen, symbol( "spin-box-arrow-up" ) ); + setStrutSize( Q::StatusIndicator, 16_px, 16_px ); + setSymbol( Q::StatusIndicator, symbol( "chevron_down" ) ); + // setSymbol( Q::StatusIndicator | Q::PopupOpen, symbol( "chevron_up" ) ); // Using Focused (Pressed doesn't exist yet): setBoxBorderMetrics( Q::Panel | Q::Focused, { 1_px, 1_px, 1_px, 2_px } ); @@ -1523,20 +1522,19 @@ void Editor::setupSpinBoxMetrics() setPadding( Q::TextPanel, { 11_px, 0, 11_px, 0 } ); -#if 1 - // probably obsolete once QskGraphic supports viewBox - setStrutSize( Q::UpPanel, 32_px, 20_px ); - setPadding( Q::UpPanel, { 11_px, 7_px, 11_px, 7_px } ); + for ( auto panel : { Q::UpPanel, Q::DownPanel } ) + setStrutSize( panel, 32_px, 18_px ); - setStrutSize( Q::DownPanel, 34_px, 20_px ); - setPadding( Q::DownPanel, { 11_px, 7_px, 13_px, 7_px } ); + setSymbol( Q::UpIndicator, symbol( "chevron_up" ) ); + setSymbol( Q::DownIndicator, symbol( "chevron_down" ) ); + + setPadding( Q::UpPanel, { 0, 1_px, 0, 0 } ); + setPadding( Q::DownPanel, { 0, 0, 0, 1_px } ); + +#if 0 + // QskSpinBox::Pressed is missing yet + setBoxBorderMetrics( Q::Panel | Q::Pressed, { 1_px, 1_px, 1_px, 2_px } ); #endif - - setSymbol( Q::UpIndicator, symbol( "spin-box-arrow-up" ) ); - setSymbol( Q::DownIndicator, symbol( "spin-box-arrow-down" ) ); - - // Focused (Pressed doesn't exist yet): - setBoxBorderMetrics( Q::Panel | Q::Focused, { 1_px, 1_px, 1_px, 2_px } ); } void Editor::setupSpinBoxColors( @@ -1599,8 +1597,17 @@ void Editor::setupSpinBoxColors( panelColor = rgbSolid( panelColor, pal.background.solid.base ); setGradient( panel, panelColor ); + setBoxBorderGradient( panel, borderColor1, borderColor2, panelColor ); + if ( state == Q::Focused ) + { + const auto colors = boxBorderColors( panel ); + + setBoxBorderColors( panel | Q::Decreasing, colors ); + setBoxBorderColors( panel | Q::Increasing, colors ); + } + setColor( text, textColor ); setGraphicRole( upIndicator, graphicRole ); diff --git a/designsystems/fluent2/icons/README b/designsystems/fluent2/icons/README new file mode 100644 index 00000000..a45cea97 --- /dev/null +++ b/designsystems/fluent2/icons/README @@ -0,0 +1,10 @@ +SVGs have been taken from https://github.com/microsoft/fluentui-system-icons/tree/main/assets. + +Icons are available in different sizes. As SVGs can be scaled we only need +one version of them - chosing the '12'. + +As we are replacing the colors of the SVGs using graphic filters we set the +color in the SVGs manually to black ( instead of #212121 ). So they are in +line with icons coming from somewhere else. + +Names have been shortened ( ic_fluent_xyz_16_regular.svg -> xyz.svg ) diff --git a/designsystems/fluent2/icons/checkmark.svg b/designsystems/fluent2/icons/checkmark.svg index 70b15e35..f87de9aa 100644 --- a/designsystems/fluent2/icons/checkmark.svg +++ b/designsystems/fluent2/icons/checkmark.svg @@ -1,4 +1,3 @@ - - + + - diff --git a/designsystems/fluent2/icons/chevron_down.svg b/designsystems/fluent2/icons/chevron_down.svg new file mode 100644 index 00000000..8ac9ed11 --- /dev/null +++ b/designsystems/fluent2/icons/chevron_down.svg @@ -0,0 +1,3 @@ + + + diff --git a/designsystems/fluent2/icons/chevron_up.svg b/designsystems/fluent2/icons/chevron_up.svg new file mode 100644 index 00000000..28426e1d --- /dev/null +++ b/designsystems/fluent2/icons/chevron_up.svg @@ -0,0 +1,3 @@ + + + diff --git a/designsystems/fluent2/icons/combo-box-arrow-closed.svg b/designsystems/fluent2/icons/combo-box-arrow-closed.svg deleted file mode 100644 index c288b426..00000000 --- a/designsystems/fluent2/icons/combo-box-arrow-closed.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/designsystems/fluent2/icons/combo-box-arrow-open.svg b/designsystems/fluent2/icons/combo-box-arrow-open.svg deleted file mode 100644 index 4138c2cd..00000000 --- a/designsystems/fluent2/icons/combo-box-arrow-open.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/designsystems/fluent2/icons/qvg/checkmark.qvg b/designsystems/fluent2/icons/qvg/checkmark.qvg index dea06251998c61f581a01aed15b2dffc0c1247b4..40ab0c752d9859e8adafa9e0aba48cde5e025df8 100644 GIT binary patch literal 867 zcmWFx_I77L0}dJx0T>PBF*7qUGXyZ$e}Kp^GXDP$(*zTP@zH5w9JqF0D!#gF6Hts9F2?Jk+oR>` z2Nr|r<+~!px`%NwP>j(*G>enz9>XOE1&FyoF(wC*MPkQ9m6kgwO8k2tcY+73S2*^i z<*U1qC}KiWzx`GGuZN_U(Sa4>E(b}7xnT2{=dd`n+&||a0WlYB9!yLeVlG$=rdJGN zE?6%c#7_>Q=a>|o@}Gm%aYForBE|*rlLJC8qXRg^fMF)9{W@CL*8!-P(Lu@Ucin{l z(^0}tY2BAOU-Q;FutVGlwnI6PJDF=@Fsc|v*aMX^FoM!rApO%C0}T>2&^t^3psSmk literal 1287 zcmWFx_I77L0}g5s0S5)R1T!-eGeZD_{RfB$Bjf-7FgchQjE_zeEAN1=5yYp3ML=WO zL1t@$2>bZ|zZTAMFLB`h!?-w4Zxc|62`g*b42{=Y_6 z^A1?-FawL>-WR$KoZ5f4oKXcC%4C1Ofl1=t7jXxU6olUE_WwRlX#MKI0aO72%=Ql; z3?wlo`zHwuZRUH~ki?knU&#NjJmK^U#k|*0^APqjI`BZv6W9IUq`mJnkjLntk6@Y3KiId{f>5*)YKDpbTTeX(k6{ zWtiV#f8eTIzN-D~X6{r`Q=N>I?9Knz>|W*e zmmzTg6a(7(>wm5>r;|N24#4VE82{^eyjX63JN{p8#EJJPV)q|_;{dD|rtV1q!^z;; zonUp!&;LhQ1@DB#3q%a+=GTz;1Bx*^@SXp+p=5cHgLDqq?O^lxI2gYNvRrkLhRA{S z@=7o)Kf1=(=#7G*qtDI;pv`N`aer}EjW(gVu<_!RLZ~zDh~qbUmh^fpx^-o2LN4AGR*)0 diff --git a/designsystems/fluent2/icons/qvg/chevron_down.qvg b/designsystems/fluent2/icons/qvg/chevron_down.qvg new file mode 100644 index 0000000000000000000000000000000000000000..a8d90d4950d9ed3f8ad36091b9c78c4cc0aa3884 GIT binary patch literal 867 zcmWFx_I77L0}dJx0T>PBF*7qUGXyZ$e}Kp^GXDP$(*zTP@zH5wVMIWXPD6Iw3Kdmv)AW;Lo!vp~5OPrwq literal 0 HcmV?d00001 diff --git a/designsystems/fluent2/icons/qvg/chevron_up.qvg b/designsystems/fluent2/icons/qvg/chevron_up.qvg new file mode 100644 index 0000000000000000000000000000000000000000..11f3abc40992ccd824a84bacd3031f637374217f GIT binary patch literal 867 zcmWFx_I77L0}dJx0T>PBF*7qUGXyZ$e}Kp^GXDP$(*zTP@zH5w2&^t^3?%kj3 literal 0 HcmV?d00001 diff --git a/designsystems/fluent2/icons/qvg/combo-box-arrow-closed.qvg b/designsystems/fluent2/icons/qvg/combo-box-arrow-closed.qvg deleted file mode 100644 index 83f33a45df5772d27d5a5037ee09a424323d5af5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 547 zcmWFx_I77L0}cuh0S6Jd1T!-eGeZD_{RfB$Bjf-7FgchQjE_zeEAN1=5yYp3ML=WO zL1wdn2>S~l5=cJ)Qy_xTK>)&b5JVD_hp>^=VbKdx#0UzjK>CLj0}Ubt=p7~iVh3qq0TK2WKqQcU0H#0$qk{m1?I4IGCJ$jFtHYufq=*p|=7IDN Ta|RkjE>f7m!vdK>f;1T!-eGeZD_{RfB$Bjf-7FgchQjE_zeEAN1=5yYp3ML=WO zL1u#q2Z8@`eF+W44hoLupL;^gL3Y}I{A6?Dp4MRp;r|c1-fvnB7F+ZGzotXBmV<=V z!AotNz2Uz aQS>701qw4Tg2FkF{^86(g9rtBhY0{*drt-c diff --git a/designsystems/fluent2/icons/qvg/spin-box-arrow-down.qvg b/designsystems/fluent2/icons/qvg/spin-box-arrow-down.qvg deleted file mode 100644 index 376094d961dc46f111522a2032a27ff30cb7a4c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1167 zcmWFx_I77L0}d(>0S5`V1T!-eGeZD_{RfB$Bjf-7FgchQjE_zeEAN1=5yYp3ML=WO zL1rt12>S;h5=ei7&_I$2F7_dTX};J-8K4-m{X_l#W@}Q)?caW2aF)K;3>JIb|9{UD z#ajE<5E`uaDMa4>B}6?~-HQW^Jo#1J_Ah`u2w=8<17RSEG1sKT(X8Vuq ze|9P_nuB8AC-Z+C>waq^*~{o40x{1)=pMtx?c$L@9;1WeP6oSI3bT>aF*zvSXUMqS zy$0Dl2PGbc;78X~knMF)asV5MB*x^RRQ!L9tmYjgF=hv)1^=h3l!Ty~ckKT`(fg?= z_A0&k|C-$kCHx$~F#rsEq;Q6dA;kw=?DPD;2`~Mg038Oj7i!*DNccd+p!R-)gbz@R z(Lt2=f0OpU(+*+~8Ysr(Aad}(p2v&j4q}o2uklTJ2i7Z+{y)Mhc&CF{1CR>_%0S5`V1T!-eGeZD_{RfB$Bjf-7FgchQjE_zeEAN1=5yYp3ML=WO zL1rt12>S;hl7YcNxB*N92_}S?1jF*9Ye3<{Z2wUIzuB6UatEP(3>UYHM}oy3_y6DX zM6uREsEDEVilZq|jL|{p6PRs(U;cmP38!Bm^BjcjzCe{IBQnVmXR=qP+i`wD+AxvX{|8>Dd2+qW4pg z+{fgg^ydF-b}tlvIDkU}6b10p2`Iq~H&4V7>?Vj9)LxNZu$zEl zKzkSbpRQ68;vjPK|24iT?;z@m|F4nNyyGAWmk(*PxiExRb%|mBMTXguRULF#Xd0XQ%R_IY7f1?LV3S<5>4w8%Z6L{YQ4NJhFNA z@9qD6p3wRg*LaYJe00_wl%9nxk&zB4|C;)&yVgdkApyBlZ diff --git a/designsystems/fluent2/icons/segmented-button-check.svg b/designsystems/fluent2/icons/segmented-button-check.svg deleted file mode 100644 index b0b66ac9..00000000 --- a/designsystems/fluent2/icons/segmented-button-check.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/designsystems/fluent2/icons/spin-box-arrow-down.svg b/designsystems/fluent2/icons/spin-box-arrow-down.svg deleted file mode 100644 index a3ffcd48..00000000 --- a/designsystems/fluent2/icons/spin-box-arrow-down.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/designsystems/fluent2/icons/spin-box-arrow-up.svg b/designsystems/fluent2/icons/spin-box-arrow-up.svg deleted file mode 100644 index 34301711..00000000 --- a/designsystems/fluent2/icons/spin-box-arrow-up.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - -