From 153dd76d229b2425ac29d3f89565226a987686bb Mon Sep 17 00:00:00 2001 From: Stefan Heinz Date: Wed, 15 Nov 2023 20:16:49 +0100 Subject: [PATCH] UI: Icons for Horizontal and Vertical Split Adding new icons to represent horizontal and vertical area splitting. Pull Request: https://projects.blender.org/blender/blender/pulls/114433 --- release/datafiles/blender_icons.svg | 79 ++++++++++++++++-- .../icon16_split_horizontal.dat | Bin 0 -> 1048 bytes .../blender_icons16/icon16_split_vertical.dat | Bin 0 -> 1048 bytes .../icon32_split_horizontal.dat | Bin 0 -> 4120 bytes .../blender_icons32/icon32_split_vertical.dat | Bin 0 -> 4120 bytes .../blender/editors/datafiles/CMakeLists.txt | 2 + source/blender/editors/include/UI_icons.hh | 4 +- source/blender/editors/screen/screen_ops.cc | 4 +- 8 files changed, 76 insertions(+), 13 deletions(-) create mode 100644 release/datafiles/blender_icons16/icon16_split_horizontal.dat create mode 100644 release/datafiles/blender_icons16/icon16_split_vertical.dat create mode 100644 release/datafiles/blender_icons32/icon32_split_horizontal.dat create mode 100644 release/datafiles/blender_icons32/icon32_split_vertical.dat diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg index 03074946f1d..811300f100b 100644 --- a/release/datafiles/blender_icons.svg +++ b/release/datafiles/blender_icons.svg @@ -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" /> + + + + + + + + + + + + + + + + + + (N-3}QeW#l*nS0KyFo6yyK@|GxoZQo$RT-5`xHHZlzqUI@gik;Pza sWIf1im^_Fc)jt}31Dt;50_|UpoF-vx(f4Yh-=@? zYEezO6XZ zPU-y0m(J~j>U)Xnb8aRNao4AP@(|a)o5@4m^=Y3x#I^5c@(_1@+9wZj?Yo&g#9g2E a$wOTGZYEFTy{>wW^uBtz(=)37U-JjFLejGU literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons32/icon32_split_vertical.dat b/release/datafiles/blender_icons32/icon32_split_vertical.dat new file mode 100644 index 0000000000000000000000000000000000000000..2880309135d15efecdbb2bb6ea15d5c27bb37baa GIT binary patch literal 4120 zcmeHJ+YJIS46}IbaRaae5*zTrKAnaMn1Iu*#BZ?>{;`O-ul}4XMUhjtR-+_$6M%_! z-vg%|@Hh}0f!11#Iq1F5v{CEnc^@S#ol4*173Mt`-9>+^cplf8wQ=VOM?d*jEv5d_ zf0_&bylTdIRor>PQN}0n*(7 literal 0 HcmV?d00001 diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index c66a8893b90..7da882a04a6 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -342,6 +342,8 @@ set(ICON_NAMES force_fluidflow rigid_body rigid_body_constraint + split_horizontal + split_vertical image_plane image_background image_reference diff --git a/source/blender/editors/include/UI_icons.hh b/source/blender/editors/include/UI_icons.hh index 7cad22a1c93..f87715970c7 100644 --- a/source/blender/editors/include/UI_icons.hh +++ b/source/blender/editors/include/UI_icons.hh @@ -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) diff --git a/source/blender/editors/screen/screen_ops.cc b/source/blender/editors/screen/screen_ops.cc index b86cb304324..fda03080ecc 100644 --- a/source/blender/editors/screen/screen_ops.cc +++ b/source/blender/editors/screen/screen_ops.cc @@ -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,