Fix screenshot editor showing status text in the editor

This caused problems calling screenshot from menu-search
which included the status text in the screenshot.

Now the status text is shown in the global status bar
for any operators called from a screen context.
This commit is contained in:
Campbell Barton 2021-10-08 03:59:20 +11:00
parent d04d27b406
commit ba4e5399fc
3 changed files with 18 additions and 1 deletions

View File

@ -634,6 +634,8 @@ class TOPBAR_MT_window(Menu):
layout = self.layout
operator_context_default = layout.operator_context
layout.operator("wm.window_new")
layout.operator("wm.window_new_main")
@ -655,7 +657,15 @@ class TOPBAR_MT_window(Menu):
layout.separator()
layout.operator("screen.screenshot")
# Showing the status in the area doesn't work well in this case.
# - From the top-bar, the text replaces the file-menu (not so bad but strange).
# - From menu-search it replaces the area that the user may want to screen-shot.
# Setting the context to screen causes the status to show in the global status-bar.
print(layout.operator_context)
layout.operator_context = 'INVOKE_SCREEN'
layout.operator("screen.screenshot_area")
layout.operator_context = operator_context_default
if sys.platform[:3] == "win":
layout.separator()

View File

@ -227,6 +227,10 @@ enum {
WM_OP_EXEC_SCREEN,
};
#define WM_OP_CONTEXT_HAS_AREA(type) (!ELEM(type, WM_OP_INVOKE_SCREEN, WM_OP_EXEC_SCREEN))
#define WM_OP_CONTEXT_HAS_REGION(type) \
(WM_OP_CONTEXT_HAS_AREA(type) && !ELEM(type, WM_OP_INVOKE_AREA, WM_OP_EXEC_AREA))
/* property tags for RNA_OperatorProperties */
typedef enum eOperatorPropTags {
OP_PROP_TAG_ADVANCED = (1 << 0),

View File

@ -1790,7 +1790,10 @@ void WM_operator_name_call_ptr_with_depends_on_cursor(
}
wmWindow *win = CTX_wm_window(C);
ScrArea *area = CTX_wm_area(C);
/* The operator context is applied when the operator is called,
* the check for the area needs to be explicitly limited here.
* Useful so it's possible to screen-shot an area without drawing into it's header. */
ScrArea *area = WM_OP_CONTEXT_HAS_AREA(opcontext) ? CTX_wm_area(C) : NULL;
{
char header_text[UI_MAX_DRAW_STR];