blender
/
blender
136
408
Fork 591
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

UI: Icons for Horizontal and Vertical Split #114433

Merged
Harley Acheson merged 1 commits from StefanH/blender:feat/split-icons into main 2023-11-15 20:16:58 +01:00
Conversation 7 Commits 1 Files Changed 8 +76 -13
8 changed files with 76 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
release/datafiles/blender_icons.svg
View File

@ -7,7 +7,7 @@
inkscape:output_extension="org.inkscape.output.svg.inkscape"
sodipodi:docname="blender_icons.svg"
version="1.0"
inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
sodipodi:version="0.32"
id="svg2"
height="640"
@ -41,19 +41,20 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="3840"
inkscape:window-height="2036"
inkscape:window-width="1920"
inkscape:window-height="1009"
id="namedview34335"
showgrid="false"
inkscape:zoom="2"
inkscape:cx="180.75"
inkscape:cy="338.5"
inkscape:window-x="-12"
inkscape:window-y="-12"
inkscape:zoom="2.8284271"
inkscape:cx="296.80807"
inkscape:cy="340.64869"
inkscape:window-x="1912"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="layer8"
inkscape:showpageshadow="2"
inkscape:deskcolor="#808080" />
inkscape:deskcolor="#808080"
showguides="true" />
<defs
id="defs4" />
<g
@ -19131,6 +19132,66 @@
id="path4817-4"
inkscape:connector-curvature="0" />
</g>
<g
id="g5"
style="display:inline;fill:#ffffff;fill-opacity:1;enable-background:new"
transform="translate(294,-210.02105)">
<g
id="g4"
inkscape:label="O-8"
transform="translate(0,252.02105)"
style="fill:#ffffff;fill-opacity:1">
<g
id="g2"
style="display:inline;fill:#ffffff;fill-opacity:1;enable-background:new" />
<g
id="g3"
style="display:inline;fill:#ffffff;fill-opacity:1;enable-background:new">
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new"
d="m 153.5,305 a 0.50004997,0.50004997 0 0 0 -0.5,0.5 v 13 a 0.50004997,0.50004997 0 0 0 0.5,0.5 h 13 a 0.50004997,0.50004997 0 0 0 0.5,-0.5 v -13 a 0.50004997,0.50004997 0 0 0 -0.5,-0.5 z m 0.5,1 h 12 v 12 h -12 z"
id="path2"
inkscape:connector-curvature="0" />
</g>
</g>
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.8269;stroke-opacity:0.6"
id="rect3"
width="11.996062"
height="1.295352"
x="154.01895"
y="563.3548" />
</g>
<g
id="g9"
transform="rotate(90,422.51052,616.51052)"
style="display:inline;fill:#ffffff;fill-opacity:1;enable-background:new">
<g
id="g8"
inkscape:label="O-8"
transform="translate(0,252.02105)"
style="fill:#ffffff;fill-opacity:1">
<g
id="g6"
style="display:inline;fill:#ffffff;fill-opacity:1;enable-background:new" />
<g
id="g7"
style="display:inline;fill:#ffffff;fill-opacity:1;enable-background:new">
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new"
d="m 153.5,305 a 0.50004997,0.50004997 0 0 0 -0.5,0.5 v 13 a 0.50004997,0.50004997 0 0 0 0.5,0.5 h 13 a 0.50004997,0.50004997 0 0 0 0.5,-0.5 v -13 a 0.50004997,0.50004997 0 0 0 -0.5,-0.5 z m 0.5,1 h 12 v 12 h -12 z"
id="path5"
inkscape:connector-curvature="0" />
</g>
</g>
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.8269;stroke-opacity:0.6"
id="rect7"
width="11.996062"
height="1.295352"
x="154.01895"
y="563.3548" />
</g>
</g>
<g
inkscape:groupmode="layer"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 MiB

After

Width:  |  Height:  |  Size: 2.6 MiB

BIN
release/datafiles/blender_icons16/icon16_split_horizontal.dat Normal file
View File

Binary file not shown.

BIN
release/datafiles/blender_icons16/icon16_split_vertical.dat Normal file
View File

Binary file not shown.

BIN
release/datafiles/blender_icons32/icon32_split_horizontal.dat Normal file
View File

Binary file not shown.

BIN
release/datafiles/blender_icons32/icon32_split_vertical.dat Normal file
View File

Binary file not shown.

2
source/blender/editors/datafiles/CMakeLists.txt
View File

@ -342,6 +342,8 @@ set(ICON_NAMES
force_fluidflow
rigid_body
rigid_body_constraint
split_horizontal
split_vertical
image_plane
image_background
image_reference

4
source/blender/editors/include/UI_icons.hh
View File

@ -422,8 +422,8 @@ DEF_ICON_BLANK(677)
DEF_ICON_BLANK(678)
DEF_ICON_BLANK(679)
DEF_ICON_BLANK(680)
DEF_ICON_BLANK(681)
DEF_ICON_BLANK(682)
DEF_ICON(SPLIT_HORIZONTAL)
DEF_ICON(SPLIT_VERTICAL)
DEF_ICON(IMAGE_PLANE)
DEF_ICON(IMAGE_BACKGROUND)
DEF_ICON(IMAGE_REFERENCE)

4
source/blender/editors/screen/screen_ops.cc
View File

@ -3747,7 +3747,7 @@ static int screen_area_options_invoke(bContext *C, wmOperator *op, const wmEvent
uiItemFullO(layout,
"SCREEN_OT_area_split",
IFACE_("Vertical Split"),
ICON_NONE,
ICON_SPLIT_VERTICAL,
nullptr,
WM_OP_INVOKE_DEFAULT,
UI_ITEM_NONE,
@ -3760,7 +3760,7 @@ static int screen_area_options_invoke(bContext *C, wmOperator *op, const wmEvent
uiItemFullO(layout,
"SCREEN_OT_area_split",
IFACE_("Horizontal Split"),
ICON_NONE,
ICON_SPLIT_HORIZONTAL,
nullptr,
WM_OP_INVOKE_DEFAULT,
UI_ITEM_NONE,