Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: Move the 'Resolve Conflict' button closer to the text data-block

Browse Source 
Moves the Text Editor 'Resolve Conflict' button closer to data-block selector and with 'Question' icon.

Differential Revision: https://developer.blender.org/D9266

Reviewed by Hans Goudey
This commit is contained in:
Yevgeny Makarov
2020-10-27 16:30:37 -07:00
committed by Harley Acheson
parent 024b65b5e5
commit d28676d89a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
release/scripts/startup/bl_ui/space_text.py
View File

@@ -35,12 +35,12 @@ class TEXT_HT_header(Header):
TEXT_MT_editor_menus.draw_collapsible(context, layout) TEXT_MT_editor_menus.draw_collapsible(context, layout)
layout.separator_spacer()
if text and text.is_modified: if text and text.is_modified:
row = layout.row(align=True) row = layout.row(align=True)
row.alert = True row.alert = True
row.operator("text.resolve_conflict", text="", icon='HELP') row.operator("text.resolve_conflict", text="", icon='QUESTION')
layout.separator_spacer()
row = layout.row(align=True) row = layout.row(align=True)
row.template_ID(st, "text", new="text.new", row.template_ID(st, "text", new="text.new",