birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hasareej fix whitebox and physx cluster icons (#1398)

Browse Source 
Fixing the issue with the icons not appearing & deleting duplicate icons.
This commit is contained in:
Hasareej
2021-06-18 11:45:48 +01:00
committed by GitHub
parent aed989d038
commit 4ad97342c2
13 changed files with 6 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/RestoreMode.svg
+22
View File
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="24px" viewBox="0 0 22 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Restore Mode</title>
<defs>
<polygon id="path-1" points="11.1238069 12.4974069 11.1238069 23.957269 21.0482207 18.2276138 21.0482207 6.76857931"></polygon>
<mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="9.92441379" height="17.1886897" fill="white">
<use xlink:href="#path-1"></use>
</mask>
</defs>
<g id="Working-Design-Page" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Group" transform="translate(-1.000000, 0.000000)">
<rect id="Rectangle-Copy-9" x="0" y="0" width="24" height="24"></rect>
<g id="Restore-Mode" transform="translate(1.000000, 0.000000)">
<g id="Group-3" transform="translate(0.000000, -0.000083)">
<use id="Stroke-1" stroke="#FFFFFF" mask="url(#mask-2)" stroke-dasharray="1,1" xlink:href="#path-1"></use>
<polygon id="Fill-3" fill="#FFFFFF" points="10.5239172 1.02140518e-13 0.599503448 5.72910345 10.5239172 11.4582069 20.4466759 5.72910345"></polygon>
<polygon id="Fill-4" fill="#FFFFFF" points="-3.55271368e-13 18.227669 9.92386207 23.9573241 9.92386207 12.4974621 -3.55271368e-13 6.76835862"></polygon>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/Translate.svg → Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/Rotate.svg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/SketchMode.svg
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="22px" viewBox="0 0 20 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Sketch Mode</title>
<g id="Working-Design-Page" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Group" transform="translate(-2.000000, -1.000000)">
<rect id="Rectangle" x="0" y="0" width="24" height="24"></rect>
<g id="Sketch-Mode" transform="translate(2.000000, 1.000000)" fill="#FFFFFF">
<path d="M2.65010355e-05,7.15388831 C2.65010355e-05,6.57891647 0.408678709,6.34333228 0.908026019,6.63094893 L0.908026019,6.63094893 L8.52169634,11.0152726 C9.02104365,11.3028893 9.42969586,12.0088574 9.42969586,12.5840907 L9.42969586,12.5840907 L9.42969586,21.354307 C9.42969586,21.9295403 9.02104365,22.164863 8.52169634,21.8772463 L8.52169634,21.8772463 L0.908026019,17.4923997 C0.408678709,17.2045216 2.65010355e-05,16.4985534 2.65010355e-05,15.9235816 L2.65010355e-05,15.9235816 Z M19.0917649,6.63097508 C19.5911122,6.34335843 20.0000265,6.57894261 20.0000265,7.15391445 L20.0000265,7.15391445 L20.0000265,15.9236077 C20.0000265,16.4985796 19.5911122,17.2045477 19.0917649,17.4924258 L19.0917649,17.4924258 L11.4778324,21.8772725 C10.9784851,22.1648891 10.5698329,21.9295664 10.5698329,21.3543331 L10.5698329,21.3543331 L10.5698329,12.5841169 C10.5698329,12.0088836 10.9787472,11.3029154 11.4780945,11.0152988 L11.4780945,11.0152988 Z M9.09176486,0.215737888 C9.59111217,-0.0718787669 10.4084166,-0.0718787669 10.9077639,0.215737888 L10.9077639,0.215737888 L18.5206478,4.60006159 C19.0199952,4.88767824 19.0199952,5.35832368 18.5206478,5.64594033 L18.5206478,5.64594033 L10.9077639,10.030264 C10.4084166,10.3178807 9.59111217,10.3178807 9.09176486,10.030264 L9.09176486,10.030264 L1.47783241,5.64594033 C0.978485104,5.35832368 0.978485104,4.88767824 1.47783241,4.60006159 L1.47783241,4.60006159 Z" id="Fill-5"></path>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
+3 -1
View File
@@ -370,6 +370,7 @@
<file>img/UI20/toolbar/Redo.svg</file>
<file>img/UI20/toolbar/remove_link.svg</file>
<file>img/UI20/toolbar/Reset_physics_state.svg</file>
<file>img/UI20/toolbar/RestoreMode.svg</file>
<file>img/UI20/toolbar/Save.svg</file>
<file>img/UI20/toolbar/Scale.svg</file>
<file>img/UI20/toolbar/Select.svg</file>
@@ -377,9 +378,10 @@
<file>img/UI20/toolbar/Select_terrain.svg</file>
<file>img/UI20/toolbar/Simulate_Physics.svg</file>
<file>img/UI20/toolbar/Simulate_Physics_on_selected_objects.svg</file>
<file>img/UI20/toolbar/SketchMode.svg</file>
<file>img/UI20/toolbar/Terrain.svg</file>
<file>img/UI20/toolbar/Terrain_Texture.svg</file>
<file>img/UI20/toolbar/Translate.svg</file>
<file>img/UI20/toolbar/Rotate.svg</file>
<file>img/UI20/toolbar/undo.svg</file>
<file>img/UI20/toolbar/Unlocked.svg</file>
<file>img/UI20/toolbar/Vertex_snapping.svg</file>
Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
+1 -1
View File
@@ -2489,7 +2489,7 @@ namespace AzToolsFramework
// create and register the buttons (strings correspond to icons even if the values appear different)
m_translateButtonId = RegisterClusterButton(m_transformModeClusterId, "Move");
m_rotateButtonId = RegisterClusterButton(m_transformModeClusterId, "Translate");
m_rotateButtonId = RegisterClusterButton(m_transformModeClusterId, "Rotate");
m_scaleButtonId = RegisterClusterButton(m_transformModeClusterId, "Scale");
// set button tooltips