tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

UI: Icons for Area Join and Swap 

Icons provided by Alexey Adamitsky to represent screen area join and
screen area swap.

Pull Request: https://projects.blender.org/blender/blender/pulls/115712
This commit is contained in:
Harley Acheson 2023-12-02 20:08:01 +01:00 committed by Harley Acheson
parent da7128c533
commit 8933284518
9 changed files with 56 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
release/datafiles/blender_icons.svg
View File

@ -45,9 +45,9 @@
inkscape:window-height="1009"
id="namedview34335"
showgrid="false"
inkscape:zoom="2.8284271"
inkscape:cx="296.80807"
inkscape:cy="340.64869"
inkscape:zoom="1.4142136"
inkscape:cx="229.45615"
inkscape:cy="319.96582"
inkscape:window-x="1912"
inkscape:window-y="-8"
inkscape:window-maximized="1"
@ -19192,6 +19192,51 @@
x="154.01895"
y="563.3548" />
</g>
<g
style="display:inline;fill:none;enable-background:new"
id="g10"
transform="translate(423.00781,343.98439)"
inkscape:label="Q-21">
<path
d="M 16,4 H 12 V 5.5 C 12,5.77614 11.7761,6 11.5,6 V 6 C 11.2239,6 11,5.77614 11,5.5 v -2 C 11,3.22386 11.2239,3 11.5,3 h 5 C 16.7761,3 17,3.22386 17,3.5 v 13 c 0,0.2761 -0.2239,0.5 -0.5,0.5 h -5 C 11.2239,17 11,16.7761 11,16.5 v -2 C 11,14.2239 11.2239,14 11.5,14 v 0 c 0.2761,0 0.5,0.2239 0.5,0.5 V 16 h 4 z"
fill="#ffffff"
id="path1-5" />
<path
d="M 4,4 H 8 V 5.5 C 8,5.77614 8.22386,6 8.5,6 V 6 C 8.77614,6 9,5.77614 9,5.5 v -2 C 9,3.22386 8.77614,3 8.5,3 h -5 C 3.22386,3 3,3.22386 3,3.5 v 13 C 3,16.7761 3.22386,17 3.5,17 h 5 C 8.77614,17 9,16.7761 9,16.5 v -2 C 9,14.2239 8.77614,14 8.5,14 v 0 C 8.22386,14 8,14.2239 8,14.5 V 16 H 4 Z"
fill="#ffffff"
id="path2-19" />
<path
d="m 5.14645,9.64645 2,-2 C 7.23692,7.55596 7.36192,7.5 7.5,7.5 7.77615,7.5 8,7.72385 8,8 v 1.5 h 4 V 8 c 0,-0.27615 0.2239,-0.5 0.5,-0.5 0.1381,0 0.2631,0.05596 0.3536,0.14645 l 2,2 C 14.944,9.73692 15,9.86192 15,10 c 0,0.1381 -0.056,0.2631 -0.1464,0.3536 l -2,2 C 12.7631,12.444 12.6381,12.5 12.5,12.5 12.2239,12.5 12,12.2761 12,12 V 10.5 H 8 V 12 c 0,0.2761 -0.22385,0.5 -0.5,0.5 -0.13808,0 -0.26308,-0.056 -0.35355,-0.1464 l -2,-2 C 5.05596,10.2631 5,10.1381 5,10 5,9.86192 5.05596,9.73692 5.14645,9.64645 Z"
fill="#ffffff"
id="path3-9" />
</g>
<g
style="display:inline;fill:none;enable-background:new"
id="g2-0"
transform="matrix(1,0,0,-1,401.97466,364.00478)"
inkscape:label="Q-20">
<path
d="m 13,4 h 3 V 16 H 13 V 14.5 C 13,14.2239 12.7761,14 12.5,14 v 0 C 12.2239,14 12,14.2239 12,14.5 v 2 c 0,0.2761 0.2239,0.5 0.5,0.5 h 4 C 16.7761,17 17,16.7761 17,16.5 V 3.5 C 17,3.22386 16.7761,3 16.5,3 h -4 C 12.2239,3 12,3.22386 12,3.5 v 2 C 12,5.77614 12.2239,6 12.5,6 V 6 C 12.7761,6 13,5.77614 13,5.5 Z"
fill="#ffffff"
id="path1"
style="opacity:0.6" />
<path
d="M 4.16667,16 V 4 H 9 v 1 h 1 V 3.5 C 10,3.22386 9.73883,3 9.41667,3 H 3.58333 C 3.26117,3 3,3.22386 3,3.5 v 13 C 3,16.7761 3.26117,17 3.58333,17 H 9.41667 C 9.73883,17 10,16.7761 10,16.5 V 15 H 9 v 1 z"
fill="#ffffff"
id="path2-1" />
<path
d="m 9,12 h 1 v 2 H 9 Z"
fill="#ffffff"
id="path3" />
<path
d="M 10,6 H 9 v 2 h 1 z"
fill="#ffffff"
id="path4" />
<path
d="m 14.8536,9.64645 -2,-2 C 12.7631,7.55596 12.6381,7.5 12.5,7.5 12.2239,7.5 12,7.72385 12,8 V 9.5 H 7 v 1 h 5 V 12 c 0,0.2761 0.2239,0.5 0.5,0.5 0.1381,0 0.2631,-0.056 0.3536,-0.1464 l 2,-2 C 14.944,10.2631 15,10.1381 15,10 15,9.86192 14.944,9.73692 14.8536,9.64645 Z"
fill="#ffffff"
id="path5-2" />
</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_area_join.dat Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

4
scripts/startup/bl_ui/space_info.py
View File

@ -75,8 +75,8 @@ class INFO_MT_area(Menu):
layout.operator("screen.region_quadview")
layout.separator()
layout.operator("screen.area_split", text="Horizontal Split").direction = 'HORIZONTAL'
layout.operator("screen.area_split", text="Vertical Split").direction = 'VERTICAL'
layout.operator("screen.area_split", icon='SPLIT_HORIZONTAL', text="Horizontal Split").direction = 'HORIZONTAL'
layout.operator("screen.area_split", icon='SPLIT_VERTICAL', text="Vertical Split").direction = 'VERTICAL'
layout.separator()

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

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

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

@ -420,8 +420,8 @@ DEF_ICON(RIGID_BODY)
DEF_ICON(RIGID_BODY_CONSTRAINT)
DEF_ICON_BLANK(677)
DEF_ICON_BLANK(678)
DEF_ICON_BLANK(679)
DEF_ICON_BLANK(680)
DEF_ICON(AREA_JOIN)
DEF_ICON(AREA_SWAP)
DEF_ICON(SPLIT_HORIZONTAL)
DEF_ICON(SPLIT_VERTICAL)
DEF_ICON(IMAGE_PLANE)

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

@ -3778,7 +3778,7 @@ static int screen_area_options_invoke(bContext *C, wmOperator *op, const wmEvent
uiItemFullO(layout,
"SCREEN_OT_area_join",
IFACE_("Join Areas"),
ICON_NONE,
ICON_AREA_JOIN,
nullptr,
WM_OP_INVOKE_DEFAULT,
UI_ITEM_NONE,
@ -3791,7 +3791,7 @@ static int screen_area_options_invoke(bContext *C, wmOperator *op, const wmEvent
uiItemFullO(layout,
"SCREEN_OT_area_swap",
IFACE_("Swap Areas"),
ICON_NONE,
ICON_AREA_SWAP,
nullptr,
WM_OP_EXEC_DEFAULT,
UI_ITEM_NONE,