From d28676d89a79e02745ebced89152f25dbfd71285 Mon Sep 17 00:00:00 2001 From: Yevgeny Makarov Date: Tue, 27 Oct 2020 16:30:37 -0700 Subject: [PATCH] UI: Move the 'Resolve Conflict' button closer to the text data-block 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 --- release/scripts/startup/bl_ui/space_text.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py index f1326823fe8..c937882bd6e 100644 --- a/release/scripts/startup/bl_ui/space_text.py +++ b/release/scripts/startup/bl_ui/space_text.py @@ -35,12 +35,12 @@ class TEXT_HT_header(Header): TEXT_MT_editor_menus.draw_collapsible(context, layout) + layout.separator_spacer() + if text and text.is_modified: row = layout.row(align=True) row.alert = True - row.operator("text.resolve_conflict", text="", icon='HELP') - - layout.separator_spacer() + row.operator("text.resolve_conflict", text="", icon='QUESTION') row = layout.row(align=True) row.template_ID(st, "text", new="text.new",