UI: Mouse Event Icon Alignment
We have a number of event icons, used on the Status Bar, to indicate mouse actions. It is currently difficult to align these nicely because they vary in width and design. This PR makes them all the same design width and aligned to the left edge. This removes a need to add negative spacing before any of them and only requires space after some of them. This also adds a new one to indicate "double left click" as my current use of this looks a bit sus. This also adds a "mouse wheel scroll" Pull Request: https://projects.blender.org/blender/blender/pulls/125731
This commit is contained in:
Harley Acheson
committed by
Harley Acheson
Harley Acheson
parent
1d841806b5
commit
989fcc2c4f
@@ -1 +1 @@
|
||||
<svg height="1800" viewBox="0 0 1400 1800" width="1400" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g fill="#fff"><path d="m10.484375 450.98353c-.752 0-1.4538175.239-2.0234375.64453-.88567.63055-1.4609375 1.67061-1.4609375 2.83985v4.03209c.00003.27537.2226769.4989.4980469.5l4.0097651.008c.27613-.00003.49997-.22387.5-.5l-.007812-6.98931v-.002-.0352c-.001-.27524-.22466-.49793-.5-.49796zm2.515625 0v1h2.508368c1.38452 0 2.484375 1.09985 2.484375 2.48438v9.04771c0 1.38452-1.099855 2.48438-2.484375 2.48438h-5.023993c-1.38452 0-2.484375-1.09986-2.484375-2.48438v-3.51562h-1v3.51562c0 1.92123 1.563145 3.48438 3.484375 3.48438h5.023993c1.92123 0 3.484375-1.56314 3.484375-3.48438v-9.04771c0-1.92123-1.563145-3.48438-3.484375-3.48438z" transform="matrix(100 0 0 100 -599.6372 -44999.1765)"/></g></svg>
|
||||
<svg id="svg1" height="1800" viewBox="0 0 1800 1800" width="1800" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g id="g1" fill="#fff"><path id="path1" d="m10.484375 450.98353c-.752 0-1.4538175.239-2.0234375.64453-.88567.63055-1.4609375 1.67061-1.4609375 2.83985v4.03209c.00003.27537.2226769.4989.4980469.5l4.0097651.008c.27613-.00003.49997-.22387.5-.5l-.007812-6.98931v-.002-.0352c-.001-.27524-.22466-.49793-.5-.49796zm2.515625 0v1h2.508368c1.38452 0 2.484375 1.09985 2.484375 2.48438v9.04771c0 1.38452-1.099855 2.48438-2.484375 2.48438h-5.023993c-1.38452 0-2.484375-1.09986-2.484375-2.48438v-3.51562h-1v3.51562c0 1.92123 1.563145 3.48438 3.484375 3.48438h5.023993c1.92123 0 3.484375-1.56314 3.484375-3.48438v-9.04771c0-1.92123-1.563145-3.48438-3.484375-3.48438z" transform="matrix(100 0 0 100 -599.6372 -44999.17700000001)"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
1
release/datafiles/icons_svg/mouse_lmb_2x.svg
Normal file
1
release/datafiles/icons_svg/mouse_lmb_2x.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg id="svg1" height="1800" viewBox="0 0 1800 1800" width="1800" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g fill="#fff"><g id="g1"><path id="path1" d="m15.508364 450.98329-2.508359.00024v1h2.508359c1.384518 0 2.484375 1.09984 2.484375 2.48437v1.52677h1.000002v-1.527c0-1.92123-1.563149-3.48438-3.484375-3.48438zm-4.00834.00022-1.015644.00002c-.7519988 0-1.4538189.239-2.0234377.64453-.8856682.63055-1.4609375 1.6706-1.4609375 2.83984v4.03209c.00003.27537.2226775.4989.4980469.5l4.0097653.008c.27613-.00003.49997-.22387.5-.5l-.0078-6.98932v-.002-.0352c-.001-.27524-.22466-.49794-.5-.49797zm-4.5000192 9.01648v3.51563c0 1.92123 1.5631486 3.48437 3.4843752 3.48437h5.023984c1.357288 0 2.582661-.87045 3.157608-2.00588l-1.149211-.00026c-.451437.59602-1.193338 1.0066-2.008398 1.0066h-5.023983c-1.3845176 0-2.4843752-1.09984-2.4843752-2.48435v-3.51565z" transform="matrix(100 0 0 100 -599.6372 -44999.17700000001)"/></g><path id="text1" d="m1179.7115 1354.2299h-127.4248l-99.9569-190.2608-102.20585 190.2608h-128.42606l166.0455-293.0658-163.42176-310.37998h131.42461l98.45766 204.37652 98.8326-204.37652h124.8007l-163.7964 306.26768zm520.0311 45.401h-443.08v-105.6194c63.6238-73.4053 142.5751-129.8923 207.2165-201.7214 30.2356-35.6391 51.7253-66.7091 64.4692-93.21004 12.7438-26.50081 19.1158-52.69701 19.1158-78.58865 0-31.06998-8.246-54.98169-24.7381-71.73509-16.2423-17.05804-39.7309-25.58704-70.4663-25.58704-22.9891 0-68.116 15.28054-93.6037 26.85563-39.0848 15.49928-102.1204 49.74497-102.1204 49.74497v-151.23768c17.7416-9.44284 63.5138-24.31024 97.9973-33.75307 34.7334-9.44283 69.4667-14.16426 104.2002-14.16426 69.9664 0 123.3157 17.97186 160.0482 53.91555 36.7325 35.63909 55.0986 86.20394 55.0986 151.69459 0 42.94968-8.8707 83.76707-26.6121 122.45229-17.4916 38.6852-44.3539 78.5886-80.5864 119.7107-22.7391 25.587-45.6033 49.1942-68.5921 70.8213-22.9891 21.3226-39.3562 49.1317-49.1016 57.6607h250.7549z" fill-rule="evenodd" stroke-width="43.3615"/></g></svg>
|
||||
|
After Width: | Height: | Size: 2.2 KiB |
@@ -1 +1 @@
|
||||
<svg height="1800" viewBox="0 0 1800 1800" width="1800" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g fill="#fff"><path d="m92.484375 451.01563c-.752 0-1.453818.239-2.023438.64453-.88567.63055-1.460937 1.67061-1.460937 2.83985v3.99999c.00003.27537.222677.4989.498047.5l4.009765.008c.27613-.00003.49997-.22387.5-.5l-.007812-6.95721v-.002-.0352c-.001-.27524-.22466-.49793-.5-.49796zm2.515625 0v1h1.515625c1.38452 0 2.484375 1.09985 2.484375 2.48438v9.01561c0 1.38452-1.099855 2.48438-2.484375 2.48438h-4.03125c-1.38452 0-2.484375-1.09986-2.484375-2.48438v-3.51562h-1v3.51562c0 1.92123 1.563145 3.48438 3.484375 3.48438h4.03125c1.92123 0 3.484375-1.56314 3.484375-3.48438v-9.01561c0-1.92123-1.563145-3.48438-3.484375-3.48438zm6.47656.006c-.44785.0182-.64741.57103-.31445.8711.58809.54453.8418 1.0856.8418 1.60156l-.00391 6.00571c-.01.67616 1.00956.67616 1 0l.004-6.00586c0-.8509-.43179-1.65971-1.16211-2.33594-.0982-.0931-.23001-.14246-.36524-.13672zm3.01563 2.01563c-.27537.004-.49542.23047-.49219.50586v4.05859c-.01.67616 1.00956.67616 1 0v-4.05859c.003-.2815-.22632-.51025-.50781-.50586z" transform="matrix(100 0 0 100 -8800.0033 -45000.7815)"/></g></svg>
|
||||
<svg id="svg1" height="1800" viewBox="0 0 1800 1800" width="1800" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g fill="#fff"><path id="path1-0" d="m1347.9272 100.2289c-44.785 1.82-64.741 57.103-31.445 87.11 58.809 54.453 84.18 108.56 84.18 160.156l-.391 601.94086c-1 67.61594 100.6792 67.61594 99.7232 0l.4-601.95586c0-85.09-42.9022-165.971-115.9342-233.594-9.82-9.31-23.001-14.245998-36.524-13.672zm301.563 200.17924c-27.537.4-49.542 23.047-49.219 50.586v398.10992c-1 67.616 100.8176 67.616 99.8616 0v-398.10992c.3-28.15-22.4936-51.025-50.6426-50.586z" stroke-width="100"/><path id="path1" d="m10.484375 450.98353c-.752 0-1.4538175.239-2.0234375.64453-.88567.63055-1.4609375 1.67061-1.4609375 2.83985v4.03209c.00003.27537.2226769.4989.4980469.5l4.0097651.008c.27613-.00003.49997-.22387.5-.5l-.007812-6.98931v-.002-.0352c-.001-.27524-.22466-.49793-.5-.49796zm2.515625 0v1h2.508368c1.38452 0 2.484375 1.09985 2.484375 2.48438v9.04771c0 1.38452-1.099855 2.48438-2.484375 2.48438h-5.023993c-1.38452 0-2.484375-1.09986-2.484375-2.48438v-3.51562h-1v3.51562c0 1.92123 1.563145 3.48438 3.484375 3.48438h5.023993c1.92123 0 3.484375-1.56314 3.484375-3.48438v-9.04771c0-1.92123-1.563145-3.48438-3.484375-3.48438z" transform="matrix(100 0 0 100 -599.6372 -44999.17700000001)"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.5 KiB |
@@ -1 +1 @@
|
||||
<svg height="1800" viewBox="0 0 1400 1800" width="1400" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g fill="#fff"><path d="m31.484375 450.99458c-1.92123 0-3.484375 1.56315-3.484375 3.48438v9.03666c0 1.92123 1.563145 3.48438 3.484375 3.48438h5.082348c1.92123 0 3.484375-1.56315 3.484375-3.48438v-9.03666c0-1.92123-1.563145-3.48438-3.484375-3.48438zm0 1h5.082348c1.38453 0 2.484375 1.09985 2.484375 2.48438v9.03666c0 1.38453-1.099845 2.48438-2.484375 2.48438h-5.082348c-1.38453 0-2.484375-1.09985-2.484375-2.48438v-9.03666c0-1.38453 1.099845-2.48438 2.484375-2.48438zm1.5625 1c-.57133 0-1.046875.47555-1.046875 1.04688v4.91166c0 .57133.475545 1.04688 1.046875 1.04688h1.973036c.57133 0 1.046875-.47555 1.046875-1.04688v-4.91166c0-.57133-.475545-1.04688-1.046875-1.04688z" transform="matrix(99.598235 0 0 100 -2688.8846 -44999.729)"/></g></svg>
|
||||
<svg id="svg1" height="1800" viewBox="0 0 1800 1800" width="1800" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g id="g1" fill="#fff"><path id="path1" d="m31.484375 450.99458c-1.92123 0-3.484375 1.56315-3.484375 3.48438v9.03666c0 1.92123 1.563145 3.48438 3.484375 3.48438h5.082348c1.92123 0 3.484375-1.56315 3.484375-3.48438v-9.03666c0-1.92123-1.563145-3.48438-3.484375-3.48438zm0 1h5.082348c1.38453 0 2.484375 1.09985 2.484375 2.48438v9.03666c0 1.38453-1.099845 2.48438-2.484375 2.48438h-5.082348c-1.38453 0-2.484375-1.09985-2.484375-2.48438v-9.03666c0-1.38453 1.099845-2.48438 2.484375-2.48438zm1.5625 1c-.57133 0-1.046875.47555-1.046875 1.04688v4.91166c0 .57133.475545 1.04688 1.046875 1.04688h1.973036c.57133 0 1.046875-.47555 1.046875-1.04688v-4.91166c0-.57133-.475545-1.04688-1.046875-1.04688z" transform="matrix(99.598235 0 0 100 -2688.8846 -44999.729)"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.2 KiB |
@@ -1 +1 @@
|
||||
<svg height="1800" viewBox="0 0 1800 1800" width="1800" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g fill="#fff"><path d="m113.48438 451.00563c-1.92123 0-3.48438 1.56315-3.48438 3.48438v9.02561c0 1.92123 1.56315 3.48438 3.48438 3.48438h4.03125c1.92122 0 3.48437-1.56315 3.48437-3.48438v-9.02561c0-1.92123-1.56315-3.48438-3.48437-3.48438zm0 1h4.03125c1.38452 0 2.48437 1.09985 2.48437 2.48438v9.02561c0 1.38453-1.09985 2.48438-2.48437 2.48438h-4.03125c-1.38453 0-2.48438-1.09985-2.48438-2.48438v-9.02561c0-1.38453 1.09985-2.48438 2.48438-2.48438zm1.5625 1c-.57134 0-1.04688.47555-1.04688 1.04688v4.90061c0 .57133.47554 1.04688 1.04688 1.04688h.90625c.57133 0 1.04687-.47555 1.04687-1.04688v-4.90061c0-.57133-.47554-1.04688-1.04687-1.04688zm7.42968-1.98415c-.44785.0182-.64741.57103-.31445.8711.58809.54453.8418 1.0856.8418 1.60156l-.00391 6.00586c-.01.67616 1.00956.67616 1 0l.004-6.00586c0-.8509-.43179-1.65971-1.16211-2.33594-.0982-.0931-.23001-.14246-.36524-.13672zm3.01563 2.01563c-.27537.004-.49542.23047-.49219.50586v4.05859c-.01.67616 1.00956.67616 1 0v-4.05859c.003-.2815-.22632-.51025-.50781-.50586z" transform="matrix(100 0 0 100 -10900.0033 -45000.2815)"/></g></svg>
|
||||
<svg id="svg1" height="1800" viewBox="0 0 1800 1800" width="1800" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g fill="#fff"><path id="path1-3" d="m1347.7138 101.47718c-44.785 1.82-64.741 57.103-31.445 87.11 58.809 54.453 84.18 108.56 84.18 160.156l-.391 600.571c-1 67.61622 100.956 67.61622 100 0l.4-600.586c0-85.09-43.179-165.971-116.211-233.594-9.82-9.31-23.001-14.246-36.524-13.672zm301.563 201.563c-27.537.4-49.542 23.047-49.219 50.586v405.859c-1 67.616 100.956 67.616 100 0v-405.859c.3-28.15-22.632-51.025-50.781-50.586z" stroke-width="100"/><path id="path1" d="m31.484375 450.99458c-1.92123 0-3.484375 1.56315-3.484375 3.48438v9.03666c0 1.92123 1.563145 3.48438 3.484375 3.48438h5.082348c1.92123 0 3.484375-1.56315 3.484375-3.48438v-9.03666c0-1.92123-1.563145-3.48438-3.484375-3.48438zm0 1h5.082348c1.38453 0 2.484375 1.09985 2.484375 2.48438v9.03666c0 1.38453-1.099845 2.48438-2.484375 2.48438h-5.082348c-1.38453 0-2.484375-1.09985-2.484375-2.48438v-9.03666c0-1.38453 1.099845-2.48438 2.484375-2.48438zm1.5625 1c-.57133 0-1.046875.47555-1.046875 1.04688v4.91166c0 .57133.475545 1.04688 1.046875 1.04688h1.973036c.57133 0 1.046875-.47555 1.046875-1.04688v-4.91166c0-.57133-.475545-1.04688-1.046875-1.04688z" transform="matrix(99.598235 0 0 100 -2688.8846 -44999.729)"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.6 KiB |
1
release/datafiles/icons_svg/mouse_mmb_scroll.svg
Normal file
1
release/datafiles/icons_svg/mouse_mmb_scroll.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg id="svg1" height="1800" viewBox="0 0 1800 1800" width="1800" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g fill="#fff"><g id="g1"><path id="path1" d="m31.484382 450.99458c-1.921226 0-3.484389 1.56316-3.484389 3.48439v9.03664c0 1.92123 1.563163 3.48439 3.484389 3.48439h1.988723c-.0023-.007-.986951-1-.986951-1h-1.001824c-1.384526 0-2.484376-1.09986-2.484376-2.48439v-9.03664c0-1.38453 1.09985-2.48439 2.484376-2.48439h1.034848s1.00328-.99586 1.00327-1.00003zm3.042928.00001 1.004566 1.00003h1.03478c1.384528 0 2.484376 1.09986 2.484376 2.48439v9.03664c0 1.38453-1.099848 2.48439-2.484376 2.48439h-1.011359l-1.002942 1.00004h2.014337c1.921226 0 3.484389-1.56316 3.484389-3.48439v-9.03664c0-1.92123-1.563163-3.4844-3.484389-3.4844zm-1.469324 5.01106c-.571325.003-1.046863.47556-1.046863 1.04689v3.89319c0 .57133.475533 1.04689 1.046863 1.04689h1.928585c.571328 0 1.046862-.47556 1.046862-1.04689v-3.89319c0-.57133-.473869-1.0621-1.045187-1.05863z" transform="matrix(99.598235 0 0 100 -2688.8846 -44999.729)"/></g><g fill-rule="evenodd" stroke-width="25"><path id="path2" d="m700.0224 1600.3852-299.81007-300.3127 599.88877-.1344z"/><path id="path2-6" d="m699.97151 200.01734 300.20149 299.92135-599.88879.13433z"/></g></g></svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
@@ -1 +1 @@
|
||||
<svg height="1800" viewBox="0 0 1800 1800" width="1800" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g fill="#fff"><path d="m80.476562 451.02148c-.447856.0182-.647418.57103-.314453.8711.58809.54453.841797 1.0856.841797 1.60156l-.003906 6.00586c-.0096.67616 1.009563.67616 1 0l.0039-6.00586c0-.8509-.431789-1.65971-1.162109-2.33594-.09822-.0931-.230004-.14246-.365235-.13672zm-8.914062-.02148c-1.96498 0-3.5625 1.59753-3.5625 3.5625v8.875c0 1.96497 1.59752 3.5625 3.5625 3.5625h3.875c1.96497 0 3.5625-1.59753 3.5625-3.5625v-8.875c0-1.96497-1.59753-3.5625-3.5625-3.5625zm0 1h3.875c1.42827 0 2.5625 1.13423 2.5625 2.5625v8.875c0 1.42827-1.13423 2.5625-2.5625 2.5625h-3.875c-1.42828 0-2.5625-1.13423-2.5625-2.5625v-8.875c0-1.42827 1.13422-2.5625 2.5625-2.5625zm11.929688 1.0371c-.275376.004-.495427.23048-.492188.50587v4.05859c-.0096.67616 1.009563.67616 1 0v-4.05859c.0033-.2815-.226323-.51025-.507812-.50586z" transform="matrix(100 0 0 100 -6700.003 -45000)"/></g></svg>
|
||||
<svg id="svg1" height="1800" viewBox="0 0 1800 1800" width="1800" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g fill="#fff"><path id="path1-3" d="m1347.7138 101.47718c-44.785 1.82-64.741 57.103-31.445 87.11 58.809 54.453 84.18 108.56 84.18 160.156l-.391 600.571c-1 67.61622 100.956 67.61622 100 0l.4-600.586c0-85.09-43.179-165.971-116.211-233.594-9.82-9.31-23.001-14.246-36.524-13.672zm301.563 201.563c-27.537.4-49.542 23.047-49.219 50.586v405.859c-1 67.616 100.956 67.616 100 0v-405.859c.3-28.15-22.632-51.025-50.781-50.586z" stroke-width="100"/><path id="path1" d="m31.484375 450.99458c-1.92123 0-3.484375 1.56315-3.484375 3.48438v9.03666c0 1.92123 1.563145 3.48438 3.484375 3.48438h5.082348c1.92123 0 3.484375-1.56315 3.484375-3.48438v-9.03666c0-1.92123-1.563145-3.48438-3.484375-3.48438zm0 1h5.082348c1.38453 0 2.484375 1.09985 2.484375 2.48438v9.03666c0 1.38453-1.099845 2.48438-2.484375 2.48438h-5.082348c-1.38453 0-2.484375-1.09985-2.484375-2.48438v-9.03666c0-1.38453 1.099845-2.48438 2.484375-2.48438z" transform="matrix(99.598235 0 0 100 -2688.8846 -44999.729)"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.4 KiB |
@@ -1 +1 @@
|
||||
<svg height="1800" viewBox="0 0 1400 1800" width="1400" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g fill="#fff"><path d="m57.512484 450.98438c.752 0 1.453818.239 2.023438.64453.88567.63055 1.460937 1.67061 1.460937 2.83985v4.03124c-.00003.27537-.222677.4989-.498047.5l-4.009765.008c-.27613-.00003-.49997-.22387-.5-.5l.0078-6.98846v-.002-.0352c.001-.27524.22466-.49793.5-.49796zm-2.515625 0v1h-2.512484c-1.38452 0-2.484375 1.09985-2.484375 2.48438v9.04686c0 1.38452 1.099855 2.48438 2.484375 2.48438h5.028109c1.38452 0 2.484375-1.09986 2.484375-2.48438v-3.51562h1v3.51562c0 1.92123-1.563145 3.48438-3.484375 3.48438h-5.028109c-1.92123 0-3.484375-1.56314-3.484375-3.48438v-9.04686c0-1.92123 1.563145-3.48438 3.484375-3.48438z" transform="matrix(100 0 0 100 -4799.843 -44999.219)"/></g></svg>
|
||||
<svg id="svg1" height="1800" viewBox="0 0 1800 1800" width="1800" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g id="g1" fill="#fff"><path id="path1" d="m57.512484 450.98438c.752 0 1.453818.239 2.023438.64453.88567.63055 1.460937 1.67061 1.460937 2.83985v4.03124c-.00003.27537-.222677.4989-.498047.5l-4.009765.008c-.27613-.00003-.49997-.22387-.5-.5l.0078-6.98846v-.002-.0352c.001-.27524.22466-.49793.5-.49796zm-2.515625 0v1h-2.512484c-1.38452 0-2.484375 1.09985-2.484375 2.48438v9.04686c0 1.38452 1.099855 2.48438 2.484375 2.48438h5.028109c1.38452 0 2.484375-1.09986 2.484375-2.48438v-3.51562h1v3.51562c0 1.92123-1.563145 3.48438-3.484375 3.48438h-5.028109c-1.92123 0-3.484375-1.56314-3.484375-3.48438v-9.04686c0-1.92123 1.563145-3.48438 3.484375-3.48438z" transform="matrix(100 0 0 100 -4799.843 -44999.219)"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
@@ -1 +1 @@
|
||||
<svg height="1800" viewBox="0 0 1800 1800" width="1800" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g fill="#fff"><path d="m138.51562 451.00563c.752 0 1.45382.239 2.02344.64453.88567.63055 1.46094 1.67061 1.46094 2.83985v4.00999c-.00003.27537-.22268.4989-.49805.5l-4.00976.008c-.27613-.00003-.49997-.22387-.5-.5l.00781-6.96721v-.002-.0352c.001-.27524.22466-.49793.5-.49796zm-2.51562 0v1h-1.51563c-1.38451 0-2.48437 1.09985-2.48437 2.48438v9.02561c0 1.38452 1.09986 2.48438 2.48437 2.48438h4.03125c1.38452 0 2.48438-1.09986 2.48438-2.48438v-3.51562h1v3.51562c0 1.92123-1.56315 3.48438-3.48438 3.48438h-4.03125c-1.92122 0-3.48437-1.56314-3.48437-3.48438v-9.02561c0-1.92123 1.56315-3.48438 3.48437-3.48438zm7.47656.0159c-.44785.0182-.64741.57103-.31445.8711.58809.54453.8418 1.0856.8418 1.60156l-.00391 6.00581c-.01.67616 1.00956.67616 1 0l.004-6.00586c0-.8509-.43179-1.65971-1.16211-2.33594-.0982-.0931-.23001-.14246-.36524-.13672zm3.01563 2.01563c-.27537.004-.49542.23047-.49219.50586v4.05859c-.01.67616 1.00956.67616 1 0v-4.05859c.003-.2815-.22632-.51025-.50781-.50586z" transform="matrix(100 0 0 100 -13000.003 -45000.2815)"/></g></svg>
|
||||
<svg id="svg1" height="1800" viewBox="0 0 1800 1800" width="1800" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g fill="#fff"><g id="g1"><path id="path1" d="m57.512484 450.98438c.752 0 1.453818.239 2.023438.64453.88567.63055 1.460937 1.67061 1.460937 2.83985v4.03124c-.00003.27537-.222677.4989-.498047.5l-4.009765.008c-.27613-.00003-.49997-.22387-.5-.5l.0078-6.98846v-.002-.0352c.001-.27524.22466-.49793.5-.49796zm-2.515625 0v1h-2.512484c-1.38452 0-2.484375 1.09985-2.484375 2.48438v9.04686c0 1.38452 1.099855 2.48438 2.484375 2.48438h5.028109c1.38452 0 2.484375-1.09986 2.484375-2.48438v-3.51562h1v3.51562c0 1.92123-1.563145 3.48438-3.484375 3.48438h-5.028109c-1.92123 0-3.484375-1.56314-3.484375-3.48438v-9.04686c0-1.92123 1.563145-3.48438 3.484375-3.48438z" transform="matrix(100 0 0 100 -4799.843 -44999.219)"/></g><path id="path1-4" d="m1347.6666 101.46971c-44.785 1.82001-64.741 57.10305-31.445 87.11005 58.809 54.453 84.18 108.56 84.18 160.156l-.391 600.571c-1 67.61594 100.956 67.61594 100 0l.4-600.586c0-85.09-43.179-165.971-116.211-233.594-9.82-9.31002-23.001-14.24606-36.524-13.67205zm301.563 201.56305c-27.537.4-49.542 23.047-49.219 50.586v405.859c-1 67.616 100.956 67.616 100 0v-405.859c.3-28.15-22.632-51.025-50.781-50.586z" stroke-width="100"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.5 KiB |
@@ -548,9 +548,11 @@ if(WITH_BLENDER)
|
||||
mod_wireframe
|
||||
monkey
|
||||
mouse_lmb
|
||||
mouse_lmb_2x
|
||||
mouse_lmb_drag
|
||||
mouse_mmb
|
||||
mouse_mmb_drag
|
||||
mouse_mmb_scroll
|
||||
mouse_move
|
||||
mouse_rmb
|
||||
mouse_rmb_drag
|
||||
|
||||
@@ -246,6 +246,8 @@ DEF_ICON(RNA_ADD)
|
||||
DEF_ICON(MOUSE_LMB)
|
||||
DEF_ICON(MOUSE_MMB)
|
||||
DEF_ICON(MOUSE_RMB)
|
||||
DEF_ICON(MOUSE_MMB_SCROLL)
|
||||
DEF_ICON(MOUSE_LMB_2X)
|
||||
DEF_ICON(MOUSE_MOVE)
|
||||
DEF_ICON(MOUSE_LMB_DRAG)
|
||||
DEF_ICON(MOUSE_MMB_DRAG)
|
||||
|
||||
@@ -559,6 +559,9 @@ int UI_icon_from_event_type(short event_type, short event_value)
|
||||
} while ((di = di->data.input.next));
|
||||
|
||||
if (event_type == LEFTMOUSE) {
|
||||
if (event_value == KM_DBL_CLICK) {
|
||||
return ICON_MOUSE_LMB_2X;
|
||||
}
|
||||
return (event_value == KM_CLICK_DRAG) ? ICON_MOUSE_LMB_DRAG : ICON_MOUSE_LMB;
|
||||
}
|
||||
if (event_type == MIDDLEMOUSE) {
|
||||
|
||||
@@ -6800,14 +6800,10 @@ bool uiTemplateEventFromKeymapItem(uiLayout *layout,
|
||||
|
||||
/* Icon and text separately is closer together with aligned layout. */
|
||||
|
||||
if (icon >= ICON_MOUSE_LMB && icon <= ICON_MOUSE_RMB_DRAG) {
|
||||
/* Negative space before all narrow mice icons. */
|
||||
uiItemS_ex(layout, -0.5f);
|
||||
}
|
||||
uiItemL(layout, "", icon);
|
||||
if (icon >= ICON_MOUSE_LMB && icon <= ICON_MOUSE_RMB) {
|
||||
/* Negative space after non-drag mice icons. */
|
||||
uiItemS_ex(layout, -0.5f);
|
||||
if (icon >= ICON_MOUSE_LMB && icon <= ICON_MOUSE_MMB_SCROLL) {
|
||||
/* Negative space after narrow mice icons. */
|
||||
uiItemS_ex(layout, -0.9f);
|
||||
}
|
||||
|
||||
uiItemS_ex(layout, 0.3f);
|
||||
|
||||
@@ -876,7 +876,7 @@ WorkspaceStatus::WorkspaceStatus(bContext *C)
|
||||
|
||||
static constexpr float STATUS_AFTER_TEXT = 0.7f;
|
||||
static constexpr float STATUS_BEFORE_TEXT = 0.3f;
|
||||
static constexpr float STATUS_MOUSE_ICON_PAD = -0.5f;
|
||||
static constexpr float STATUS_MOUSE_ICON_PAD = -0.9f;
|
||||
|
||||
static void ed_workspace_status_text_item(WorkSpace *workspace, std::string text)
|
||||
{
|
||||
@@ -892,13 +892,9 @@ static void ed_workspace_status_mouse_item(WorkSpace *workspace,
|
||||
const bool inverted = false)
|
||||
{
|
||||
if (icon) {
|
||||
if (icon >= ICON_MOUSE_LMB && icon <= ICON_MOUSE_RMB_DRAG) {
|
||||
/* Negative space before all narrow mice icons. */
|
||||
ed_workspace_status_space(workspace, STATUS_MOUSE_ICON_PAD);
|
||||
}
|
||||
ed_workspace_status_item(workspace, {}, icon, 0.0f, inverted);
|
||||
if (icon >= ICON_MOUSE_LMB && icon <= ICON_MOUSE_RMB) {
|
||||
/* Negative space after non-drag mice icons. */
|
||||
if (icon >= ICON_MOUSE_LMB && icon <= ICON_MOUSE_MMB_SCROLL) {
|
||||
/* Negative space after narrow mice icons. */
|
||||
ed_workspace_status_space(workspace, STATUS_MOUSE_ICON_PAD);
|
||||
}
|
||||
}
|
||||
@@ -962,10 +958,6 @@ void WorkspaceStatus::opmodal(std::string text,
|
||||
if (!ELEM(kmi->oskey, KM_NOTHING, KM_ANY)) {
|
||||
ed_workspace_status_item(workspace_, {}, ICON_EVENT_OS, 0.0f, inverted);
|
||||
}
|
||||
if (kmi->val == KM_DBL_CLICK) {
|
||||
ed_workspace_status_item(workspace_, "2" BLI_STR_UTF8_MULTIPLICATION_SIGN, ICON_NONE);
|
||||
ed_workspace_status_space(workspace_, -0.7f);
|
||||
}
|
||||
ed_workspace_status_mouse_item(workspace_, icon, inverted);
|
||||
ed_workspace_status_text_item(workspace_, std::move(text));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user