QCommonStyle: use arrows from Qt Icon Library
Replace all standard arrow icons with the icons from Figma/Qt Icon Library. Task-number: QTBUG-128665 Change-Id: I8b0c3426eaba7f55436f942428eef73fac827483 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
@ -80,6 +80,18 @@ qt_internal_extend_target(Widgets CONDITION APPLE
|
||||
|
||||
# Resources:
|
||||
set(qstyle_resource_files
|
||||
"styles/images/arrow-down-128.png"
|
||||
"styles/images/arrow-down-16.png"
|
||||
"styles/images/arrow-down-32.png"
|
||||
"styles/images/arrow-left-128.png"
|
||||
"styles/images/arrow-left-16.png"
|
||||
"styles/images/arrow-left-32.png"
|
||||
"styles/images/arrow-right-128.png"
|
||||
"styles/images/arrow-right-16.png"
|
||||
"styles/images/arrow-right-32.png"
|
||||
"styles/images/arrow-up-128.png"
|
||||
"styles/images/arrow-up-16.png"
|
||||
"styles/images/arrow-up-32.png"
|
||||
"styles/images/cdr-128.png"
|
||||
"styles/images/cdr-16.png"
|
||||
"styles/images/cdr-32.png"
|
||||
@ -108,9 +120,6 @@ set(qstyle_resource_files
|
||||
"styles/images/diropen-128.png"
|
||||
"styles/images/diropen-16.png"
|
||||
"styles/images/diropen-32.png"
|
||||
"styles/images/down-128.png"
|
||||
"styles/images/down-16.png"
|
||||
"styles/images/down-32.png"
|
||||
"styles/images/dvd-128.png"
|
||||
"styles/images/dvd-16.png"
|
||||
"styles/images/dvd-32.png"
|
||||
@ -144,9 +153,6 @@ set(qstyle_resource_files
|
||||
"styles/images/information-128.png"
|
||||
"styles/images/information-16.png"
|
||||
"styles/images/information-32.png"
|
||||
"styles/images/left-128.png"
|
||||
"styles/images/left-16.png"
|
||||
"styles/images/left-32.png"
|
||||
"styles/images/media-pause-128.png"
|
||||
"styles/images/media-pause-16.png"
|
||||
"styles/images/media-pause-32.png"
|
||||
@ -190,9 +196,6 @@ set(qstyle_resource_files
|
||||
"styles/images/question-32.png"
|
||||
"styles/images/refresh-24.png"
|
||||
"styles/images/refresh-32.png"
|
||||
"styles/images/right-128.png"
|
||||
"styles/images/right-16.png"
|
||||
"styles/images/right-32.png"
|
||||
"styles/images/standardbutton-apply-128.png"
|
||||
"styles/images/standardbutton-apply-16.png"
|
||||
"styles/images/standardbutton-apply-32.png"
|
||||
@ -267,9 +270,6 @@ set(qstyle_resource_files
|
||||
"styles/images/trash-128.png"
|
||||
"styles/images/trash-16.png"
|
||||
"styles/images/trash-32.png"
|
||||
"styles/images/up-128.png"
|
||||
"styles/images/up-16.png"
|
||||
"styles/images/up-32.png"
|
||||
"styles/images/viewdetailed-128.png"
|
||||
"styles/images/viewdetailed-16.png"
|
||||
"styles/images/viewdetailed-32.png"
|
||||
|
BIN
src/widgets/styles/images/arrow-down-128.png
Normal file
After Width: | Height: | Size: 279 B |
BIN
src/widgets/styles/images/arrow-down-16.png
Normal file
After Width: | Height: | Size: 206 B |
BIN
src/widgets/styles/images/arrow-down-32.png
Normal file
After Width: | Height: | Size: 766 B |
4
src/widgets/styles/images/arrow-down.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.7071 7.29289C21.3166 6.90237 20.6834 6.90237 20.2929 7.29289L12 15.5858L3.70711 7.29289C3.31658 6.90237 2.68342 6.90237 2.29289 7.29289C1.90237 7.68342 1.90237 8.31658 2.29289 8.70711L11.2929 17.7071C11.6834 18.0976 12.3166 18.0976 12.7071 17.7071L21.7071 8.70711C22.0976 8.31658 22.0976 7.68342 21.7071 7.29289Z" fill="#0D0D0D"/>
|
||||
<path d="M3 7C2.74408 7 2.48816 7.09763 2.29289 7.29289C1.90237 7.68342 1.90237 8.31658 2.29289 8.70711L11.2929 17.7071C11.6834 18.0976 12.3166 18.0976 12.7071 17.7071L21.7071 8.70711C22.0976 8.31658 22.0976 7.68342 21.7071 7.29289C21.5118 7.09763 21.2559 7 21 7C20.9998 7 21.0002 7 21 7L3 7Z" fill="#0D0D0D"/>
|
||||
</svg>
|
After Width: | Height: | Size: 798 B |
BIN
src/widgets/styles/images/arrow-left-128.png
Normal file
After Width: | Height: | Size: 279 B |
BIN
src/widgets/styles/images/arrow-left-16.png
Normal file
After Width: | Height: | Size: 207 B |
BIN
src/widgets/styles/images/arrow-left-32.png
Normal file
After Width: | Height: | Size: 733 B |
4
src/widgets/styles/images/arrow-left.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.7071 2.29289C17.0976 2.68342 17.0976 3.31658 16.7071 3.70711L8.41421 12L16.7071 20.2929C17.0976 20.6834 17.0976 21.3166 16.7071 21.7071C16.3166 22.0976 15.6834 22.0976 15.2929 21.7071L6.29289 12.7071C5.90237 12.3166 5.90237 11.6834 6.29289 11.2929L15.2929 2.29289C15.6834 1.90237 16.3166 1.90237 16.7071 2.29289Z" fill="#0D0D0D"/>
|
||||
<path d="M17 3C17 2.74408 16.9024 2.48816 16.7071 2.29289C16.3166 1.90237 15.6834 1.90237 15.2929 2.29289L6.29289 11.2929C5.90237 11.6834 5.90237 12.3166 6.29289 12.7071L15.2929 21.7071C15.6834 22.0976 16.3166 22.0976 16.7071 21.7071C16.9024 21.5118 17 21.2559 17 21C17 20.9998 17 21.0002 17 21V3Z" fill="#0D0D0D"/>
|
||||
</svg>
|
After Width: | Height: | Size: 803 B |
BIN
src/widgets/styles/images/arrow-right-128.png
Normal file
After Width: | Height: | Size: 264 B |
BIN
src/widgets/styles/images/arrow-right-16.png
Normal file
After Width: | Height: | Size: 196 B |
BIN
src/widgets/styles/images/arrow-right-32.png
Normal file
After Width: | Height: | Size: 805 B |
4
src/widgets/styles/images/arrow-right.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.29289 2.29289C6.90237 2.68342 6.90237 3.31658 7.29289 3.70711L15.5858 12L7.29289 20.2929C6.90237 20.6834 6.90237 21.3166 7.29289 21.7071C7.68342 22.0976 8.31658 22.0976 8.70711 21.7071L17.7071 12.7071C18.0976 12.3166 18.0976 11.6834 17.7071 11.2929L8.70711 2.29289C8.31658 1.90237 7.68342 1.90237 7.29289 2.29289Z" fill="#0D0D0D"/>
|
||||
<path d="M7 3C7 2.74408 7.09763 2.48816 7.29289 2.29289C7.68342 1.90237 8.31658 1.90237 8.70711 2.29289L17.7071 11.2929C18.0976 11.6834 18.0976 12.3166 17.7071 12.7071L8.70711 21.7071C8.31658 22.0976 7.68342 22.0976 7.29289 21.7071C7.09763 21.5118 7 21.2559 7 21C7 20.9998 7 21.0002 7 21V3Z" fill="#0D0D0D"/>
|
||||
</svg>
|
After Width: | Height: | Size: 796 B |
BIN
src/widgets/styles/images/arrow-up-128.png
Normal file
After Width: | Height: | Size: 261 B |
BIN
src/widgets/styles/images/arrow-up-16.png
Normal file
After Width: | Height: | Size: 205 B |
BIN
src/widgets/styles/images/arrow-up-32.png
Normal file
After Width: | Height: | Size: 629 B |
4
src/widgets/styles/images/arrow-up.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.7071 16.7071C21.3166 17.0976 20.6834 17.0976 20.2929 16.7071L12 8.41421L3.70711 16.7071C3.31658 17.0976 2.68342 17.0976 2.29289 16.7071C1.90237 16.3166 1.90237 15.6834 2.29289 15.2929L11.2929 6.29289C11.6834 5.90237 12.3166 5.90237 12.7071 6.29289L21.7071 15.2929C22.0976 15.6834 22.0976 16.3166 21.7071 16.7071Z" fill="#0D0D0D"/>
|
||||
<path d="M21 17C21.2559 17 21.5118 16.9024 21.7071 16.7071C22.0976 16.3166 22.0976 15.6834 21.7071 15.2929L12.7071 6.29289C12.3166 5.90237 11.6834 5.90237 11.2929 6.29289L2.29289 15.2929C1.90237 15.6834 1.90237 16.3166 2.29289 16.7071C2.48816 16.9024 2.74408 17 3 17C2.99977 17 3.00023 17 3 17L21 17Z" fill="#0D0D0D"/>
|
||||
</svg>
|
After Width: | Height: | Size: 806 B |
Before Width: | Height: | Size: 9.3 KiB |
Before Width: | Height: | Size: 817 B |
Before Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 9.2 KiB |
Before Width: | Height: | Size: 826 B |
Before Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 9.1 KiB |
Before Width: | Height: | Size: 811 B |
Before Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 9.1 KiB |
Before Width: | Height: | Size: 814 B |
Before Width: | Height: | Size: 1.8 KiB |
@ -5969,16 +5969,16 @@ QIcon QCommonStylePrivate::iconFromResourceTheme(QCommonStyle::StandardPixmap st
|
||||
: QStyle::SP_ArrowLeft,
|
||||
option, widget);
|
||||
case QStyle::SP_ArrowLeft:
|
||||
addIconFiles(u"left-", pngIconSizes, icon);
|
||||
addIconFiles(u"arrow-left-", pngIconSizes, icon);
|
||||
break;
|
||||
case QStyle::SP_ArrowRight:
|
||||
addIconFiles(u"right-", pngIconSizes, icon);
|
||||
addIconFiles(u"arrow-right-", pngIconSizes, icon);
|
||||
break;
|
||||
case QStyle::SP_ArrowUp:
|
||||
addIconFiles(u"up-", pngIconSizes, icon);
|
||||
addIconFiles(u"arrow-up-", pngIconSizes, icon);
|
||||
break;
|
||||
case QStyle::SP_ArrowDown:
|
||||
addIconFiles(u"down-", pngIconSizes, icon);
|
||||
addIconFiles(u"arrow-down-", pngIconSizes, icon);
|
||||
break;
|
||||
case QStyle::SP_DirHomeIcon:
|
||||
case QStyle::SP_DirIcon:
|
||||
|