griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: Show "Not Found" Icon when Not Found

Browse Source 
In the unlikely event that an icon is requested that is not found, show
a specific icon that is meant to indicate this state, in "Error" color.

Pull Request: https://projects.blender.org/blender/blender/pulls/134959
This commit is contained in:
Harley Acheson
2025-03-03 22:25:42 +01:00
committed by Harley Acheson
parent f15e72971a
commit a021176ff4
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/icons_svg/not_found.svg
View File

@@ -1 +1 @@
<svg id="svg8" fill="none" height="1600" viewBox="0 0 48 48" width="1600" 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="#ffffff" opacity="0.2" visible="true" /></sodipodi:namedview><g fill="#fff"><path id="path1-1" d="m5.9972213 3.0020547c-2.808152.0030853-3.0063786.1357382-3.0059938 3.0082759l.00482 35.9875574c.0004394 3.280005.5216064 3.013264 2.989982 3.012574l36.0186395-.010072c2.358112-.000659 2.980726-1.199828 2.980981-2.983596l-.008138-36.0091685c-.000488-2.1594139-.629553-3.0477066-2.992106-3.0451109z" fill-opacity=".17817" stroke-linecap="round" stroke-linejoin="round" stroke-width="5.41905"/><g id="g9" fill-opacity=".664526"><path id="path8" d="m43.488281 35.960937c-.828427 0-1.5.671573-1.5 1.5v4.541016h-10.478515c-.828427 0-1.5.671573-1.5 1.5s.671573 1.5 1.5 1.5h10.49512c2.142046.01468 2.983312-1.025851 2.990775-2.998155l-.0074-4.542861c-.0013-.828426-.671573-1.5-1.5-1.5z"/><path id="path1" d="m23.998047 10.539063c-.828427 0-1.5.671573-1.5 1.5v17.691406c0 .828427.671573 1.5 1.5 1.5s1.5-.671573 1.5-1.5v-17.691406c0-.828427-.671573-1.5-1.5-1.5z"/><path id="path2" d="m24.017578 34.080078a1.95 1.95 0 0 0 -1.380859.564453l-.02344.02344a1.95 1.95 0 0 0 -.01172 2.757812 1.95 1.95 0 0 0 2.757813.01367l.02344-.02539a1.95 1.95 0 0 0 .01172-2.757812 1.95 1.95 0 0 0 -1.376953-.576172z"/><path id="path3" d="m4.5039062 3.0078125a1.50015 1.50015 0 0 0 -1.4999999 1.5v5.9843755a1.5 1.5 0 0 0 1.4999999 1.5 1.5 1.5 0 0 0 1.5-1.5v-4.4843755h10.4960938a1.5 1.5 0 0 0 1.5-1.5 1.5 1.5 0 0 0 -1.5-1.5z"/><path id="path4" d="m4.515625 19.505859a1.5 1.5 0 0 0 -1.5 1.5v6a1.5 1.5 0 0 0 1.5 1.5 1.5 1.5 0 0 0 1.5-1.5v-6a1.5 1.5 0 0 0 -1.5-1.5z"/><path id="path5" d="m43.494141 19.486328a1.5 1.5 0 0 0 -1.5 1.5v6.011719a1.5 1.5 0 0 0 1.5 1.5 1.5 1.5 0 0 0 1.5-1.5v-6.011719a1.5 1.5 0 0 0 -1.5-1.5z"/><path id="path6" d="m31.505859 2.9707031c-.828427 0-1.5.6715729-1.5 1.5s.671573 1.5 1.5 1.5h10.488282v4.5332029c0 .828427.671573 1.5 1.5 1.5s1.5-.671573 1.5-1.5v-4.5055276c-.000083-1.9206438-.509245-3.0423526-2.990775-3.0276753z"/><path id="path7" d="m4.5058594 36.007812a1.5 1.5 0 0 0 -1.5 1.5v6.00586a1.50015 1.50015 0 0 0 1.5 1.5h11.9882816a1.5 1.5 0 0 0 1.5-1.5 1.5 1.5 0 0 0 -1.5-1.5h-10.4882816v-4.50586a1.5 1.5 0 0 0 -1.5-1.5z"/></g></g></svg>
<svg id="svg8" fill="none" height="1600" viewBox="0 0 48 48" width="1600" 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="path7" d="m4.5058594 36.007812a1.5 1.5 0 0 0 -1.5 1.5v6.00586a1.50015 1.50015 0 0 0 1.5 1.5h11.9882816a1.5 1.5 0 0 0 1.5-1.5 1.5 1.5 0 0 0 -1.5-1.5h-10.4882816v-4.50586a1.5 1.5 0 0 0 -1.5-1.5zm26.9999996-33.0371089c-.828427 0-1.5.6715729-1.5 1.5s.671573 1.5 1.5 1.5h10.488282v4.5332029c0 .828427.671573 1.5 1.5 1.5s1.5-.671573 1.5-1.5v-4.5055276c-.000083-1.9206438-.509245-3.0423526-2.990775-3.0276753zm11.988282 16.5156249a1.5 1.5 0 0 0 -1.5 1.5v6.011719a1.5 1.5 0 0 0 1.5 1.5 1.5 1.5 0 0 0 1.5-1.5v-6.011719a1.5 1.5 0 0 0 -1.5-1.5zm-38.978516.01953a1.5 1.5 0 0 0 -1.5 1.5v6a1.5 1.5 0 0 0 1.5 1.5 1.5 1.5 0 0 0 1.5-1.5v-6a1.5 1.5 0 0 0 -1.5-1.5zm-.0117188-16.4980455a1.50015 1.50015 0 0 0 -1.4999999 1.5v5.9843755a1.5 1.5 0 0 0 1.4999999 1.5 1.5 1.5 0 0 0 1.5-1.5v-4.4843755h10.4960938a1.5 1.5 0 0 0 1.5-1.5 1.5 1.5 0 0 0 -1.5-1.5zm38.9843748 32.9531245c-.828427 0-1.5.671573-1.5 1.5v4.541016h-10.478515c-.828427 0-1.5.671573-1.5 1.5s.671573 1.5 1.5 1.5h10.49512c2.142046.01468 2.983312-1.025851 2.990775-2.998155l-.0074-4.542861c-.0013-.828426-.671573-1.5-1.5-1.5z" fill="#fff"/><path id="path2" d="m24.027955 33.008129a2.9858684 2.9858669 0 0 0 -2.114392.864298l-.03589.03589a2.9858684 2.9858669 0 0 0 -.01796 4.222799 2.9858684 2.9858669 0 0 0 4.222803.02093l.03589-.03888a2.9858684 2.9858669 0 0 0 .01796-4.222799 2.9858684 2.9858669 0 0 0 -2.108411-.882242zm-.000131-23.8983464c-1.667133 0-3.427772.7232255-3.375931 1.6119954l.952854 16.335902c.05184.888769.755944 1.611995 2.423077 1.611995 1.667132 0 2.371235-.723226 2.423076-1.611995l.952854-16.335902c.05184-.8887699-1.708798-1.6119954-3.37593-1.6119954z"/></g></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

8
source/blender/editors/interface/interface_icons.cc
View File

@@ -1502,7 +1502,8 @@ static void icon_draw_size(float x,
if (G.debug & G_DEBUG) {
printf("%s: Internal error, no icon for icon ID: %d\n", __func__, icon_id);
}
return;
icon_id = ICON_NOT_FOUND;
icon = BKE_icon_get(icon_id);
}
if (icon->obj_type != ICON_DATA_STUDIOLIGHT) {
@@ -1575,7 +1576,10 @@ static void icon_draw_size(float x,
0.3f) :
0.0f;
float color[4];
if (mono_rgba) {
if (icon_id == ICON_NOT_FOUND) {
UI_GetThemeColor4fv(TH_ERROR, color);
}
else if (mono_rgba) {
rgba_uchar_to_float(color, mono_rgba);
}
else {