mirrors/blender
1
0
Fork 0
mirror of https://projects.blender.org/blender/blender.git synced 2025-01-22 07:22:12 -05:00
Code Issues Projects Releases Packages Wiki Activity

UI: Update icon for Grease Pencil layer and group

Browse source 
The current icon for Grease Pencil layers is a pen, it doesn't really
communicate the "layer" aspect. Replace with a paper sheet-like icon.

The layer group gets its own icon. It's a stack of animation paper.

Inspired by Daniel Correa Flores's design on DevTalk:
https://devtalk.blender.org/t/ui-discussion-grease-pencil-layer-and-layer-group-icons/30693/25

Pull Request: https://projects.blender.org/blender/blender/pulls/128208
This commit is contained in:
Pablo Vazquez 2024-09-27 17:24:40 +02:00 committed by Falk David
parent 19465bec19
commit d6ec2f0539
8 changed files with 76 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
release/datafiles/icons_svg/greasepencil_layer_group.svg Normal file
View file

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
id="svg4"
height="1600"
viewBox="0 0 1600 1600"
width="1600"
version="1.1"
sodipodi:docname="greasepencil_layer_group.svg"
inkscape:version="1.3.2 (091e20e, 2023-11-25)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs1" />
<sodipodi:namedview
pagecolor="#303030"
showgrid="true"
id="namedview1"
bordercolor="#eeeeee"
borderopacity="1"
inkscape:showpageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#505050"
inkscape:zoom="0.57098873"
inkscape:cx="731.18782"
inkscape:cy="981.63059"
inkscape:window-width="2560"
inkscape:window-height="1300"
inkscape:window-x="1080"
inkscape:window-y="227"
inkscape:window-maximized="0"
inkscape:current-layer="svg4">
<inkscape:grid
id="grid5"
units="px"
spacingx="100"
spacingy="100"
color="#4772b3"
opacity="0.2"
visible="true"
originx="0"
originy="0" />
</sodipodi:namedview>
<g
fill="#fff"
transform="matrix(100 0 0 100 -2599.9969 -49300.003)"
id="g1"
inkscape:label="g1">
<path
id="path4"
style="display:inline;opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
d="M 150.017 1300 C 122.40273 1300 100.017 1322.3858 100.017 1350 C 100.017 1377.6142 122.40273 1400 150.017 1400 L 1450.017 1400 C 1477.6313 1400 1500.017 1377.6142 1500.017 1350 C 1500.017 1322.3858 1477.6313 1300 1450.017 1300 L 150.017 1300 z M 150.017 1500 C 122.40273 1500 100.017 1522.3858 100.017 1550 C 100.017 1577.6142 122.40273 1600 150.017 1600 L 1450.017 1600 C 1477.6313 1600 1500.017 1577.6142 1500.017 1550 C 1500.017 1522.3858 1477.6313 1500 1450.017 1500 L 150.017 1500 z "
inkscape:label="layers_stack"
transform="matrix(0.01,0,0,0.01,25.999799,492.00003)" />
<path
id="path10"
style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1"
d="M 482.501 96 C 482.804 96 483.001 96.228 483.001 96.5 L 483 105.5 C 483 105.772 482.804 106 482.5 106 L 469.5 106 C 469.22386 106 469 105.77614 469 105.5 L 469 102 L 474.5 102 C 474.77614 102 475 101.77614 475 101.5 L 474.99998 96 L 482.501 96 z M 473.99998 96 L 474 97 L 474 100.5 C 474 100.77614 473.77614 101 473.5 101 L 469.5 101 C 469.05429 100.99991 468.83143 100.46076 469.14699 100.146 L 473.09699 96.196992 C 473.18859 96.076619 473.32979 96.004199 473.481 96 L 473.99998 96 z M 481 104 L 479 104 C 478.72545 103.997 478.50109 104.21844 478.5 104.49301 L 478.5 104.50701 C 478.5 104.78001 478.723 105.00002 479 105.00002 L 481 105.00002 C 481.277 105.00002 481.5 104.78001 481.5 104.50701 L 481.5 104.49301 C 481.5 104.22001 481.277 104 481 104 z M 476.561 104 L 475.439 104 C 475.196 104 475 104.223 475 104.5 C 475 104.777 475.196 105 475.439 105 L 476.561 105 C 476.804 105 477.001 104.777 477.001 104.5 C 477.001 104.223 476.804 104 476.561 104 z M 473 104 L 471 104 C 470.33333 104 470.33333 105 471 105 L 473 105 C 473.66667 105 473.66667 104 473 104 z "
transform="matrix(-1,0,0,1,509.99997,398.00003)"
inkscape:label="layers_top" />
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

7
release/datafiles/icons_svg/outliner_data_gp_layer.svg
View file

@ -1 +1,6 @@
<svg height="1600" viewBox="0 0 1600 1600" 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 fill="#fff"><path d="m269.13867 410.0332c-.49613-.0451-1.03862.15972-1.49219.61328l-8.5 8.5c-.0639.0642-.10909.14453-.13086.23243l-1 4c-.0904.36537.2401.69582.60547.60547l4-1c.0879-.0218.16823-.067.23243-.13086l8.5-8.5c.45356-.45357.65838-.99606.61328-1.49219s-.30436-.90592-.61328-1.21485l-1-1c-.30893-.30892-.71872-.56817-1.21485-.61328zm-1.88867 2.42383 2.29297 2.29297-7.29883 7.29883-3.05859.76562.76562-3.05859z" transform="matrix(100 0 0 100 -25698.672 -40901.3271)"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="1600" height="1600">
<g fill="#fff">
<path d="M483 107.5c0 .272-.196.5-.5.5h-13a.5.5 0 0 1-.5-.5V102h1v5h12V97h-8v3.5a.5.5 0 0 1-.5.5h-4a.5.5 0 0 1-.353-.854l3.95-3.949a.5.5 0 0 1 .384-.197h9.02c.303 0 .5.228.5.5z" style="display:inline;opacity:1;fill:#fff;fill-opacity:1" transform="matrix(-100 0 0 100 48400.017 -9400)"/>
<path d="M-480.5 105c-.277 0-.5.22-.5.493v.014c0 .273.223.493.5.493h2c.277 0 .5-.22.5-.493v-.014a.495.495 0 0 0-.5-.493h-2zm3.939 0c-.243 0-.44.223-.44.5s.197.5.44.5h1.122c.243 0 .439-.223.439-.5s-.196-.5-.439-.5h-1.122zm3.06 0a.499.499 0 1 0 0 1h2a.499.499 0 1 0 0-1h-2z" style="opacity:.6;fill:#fff;fill-opacity:1;stroke:none;stroke-width:.02;stroke-linecap:round;stroke-linejoin:round" transform="matrix(100 0 0 100 48400.017 -9400)"/>
</g>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 899 B

After

Width:  |  Height:  |  Size: 834 B

2
source/blender/editors/animation/anim_channels_defines.cc
View file

@ -3893,7 +3893,7 @@ static void *layer_setting_ptr(bAnimListElem *ale,
static int layer_group_icon(bAnimListElem * /*ale*/)
{
return ICON_FILE_FOLDER;
return ICON_GREASEPENCIL_LAYER_GROUP;
}
static void layer_group_color(bAnimContext * /*ac*/, bAnimListElem * /*ale*/, float r_color[3])

1
source/blender/editors/datafiles/CMakeLists.txt
View file

@ -373,6 +373,7 @@ if(WITH_BLENDER)
gp_select_strokes
graph
greasepencil
greasepencil_layer_group
grid
grip
group

1
source/blender/editors/include/UI_icons.hh
View file

@ -261,6 +261,7 @@ DEF_ICON(FACE_MAPS)
DEF_ICON(FCURVE)
DEF_ICON(FILE)
DEF_ICON(GREASEPENCIL)
DEF_ICON(GREASEPENCIL_LAYER_GROUP)
DEF_ICON(GROUP_BONE)
DEF_ICON(GROUP_UVS)
DEF_ICON(GROUP_VCOL)

2
source/blender/editors/interface/interface_icons.cc
View file

@ -492,7 +492,7 @@ static void vicon_layergroup_color_draw(
UI_icon_draw_ex(x,
y,
ICON_FILE_FOLDER,
ICON_GREASEPENCIL_LAYER_GROUP,
aspect,
1.0f,
0.0f,

2
source/blender/editors/interface/templates/interface_template_grease_pencil_layer_tree.cc
View file

@ -384,7 +384,7 @@ class LayerGroupViewItem : public AbstractTreeViewItem {
{
uiItemS_ex(&row, 0.8f);
short icon = ICON_FILE_FOLDER;
short icon = ICON_GREASEPENCIL_LAYER_GROUP;
if (group_.color_tag != LAYERGROUP_COLOR_NONE) {
icon = ICON_LAYERGROUP_COLOR_01 + group_.color_tag;
}

2
source/blender/editors/space_outliner/outliner_draw.cc
View file

@ -2947,7 +2947,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te)
data.icon = ICON_OUTLINER_DATA_GP_LAYER;
}
else if (node.is_group()) {
data.icon = ICON_FILE_FOLDER;
data.icon = ICON_GREASEPENCIL_LAYER_GROUP;
}
break;
}