diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-17 16:18:29 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-17 16:19:06 +0300 |
| commit | f1589630a0685ebba6a073bdf9526681bc696d37 (patch) | |
| tree | f2e8e204b622ac618dce96d2d87c97b2fc2ec1e1 /source/blender/editors/screen | |
| parent | 6b63765f1c44053928bf46a3f6b90d8b6d78e937 (diff) | |
Fix T65737: context menu should not have Show Header for topbar
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 37d9dd80f1a..e9f3a3fc12a 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3958,7 +3958,9 @@ void ED_screens_header_tools_menu_create(bContext *C, uiLayout *layout, void *UN { PointerRNA ptr; RNA_pointer_create((ID *)CTX_wm_screen(C), &RNA_Space, sa->spacedata.first, &ptr); - uiItemR(layout, &ptr, "show_region_header", 0, IFACE_("Show Header"), ICON_NONE); + if (!ELEM(sa->spacetype, SPACE_TOPBAR)) { + uiItemR(layout, &ptr, "show_region_header", 0, IFACE_("Show Header"), ICON_NONE); + } ARegion *ar_header = BKE_area_find_region_type(sa, RGN_TYPE_HEADER); uiLayout *col = uiLayoutColumn(layout, 0); @@ -3972,14 +3974,14 @@ void ED_screens_header_tools_menu_create(bContext *C, uiLayout *layout, void *UN IFACE_("Show Menus"), (sa->flag & HEADER_NO_PULLDOWN) ? ICON_CHECKBOX_DEHLT : ICON_CHECKBOX_HLT, "SCREEN_OT_header_toggle_menus"); - - uiItemS(layout); } /* default is WM_OP_INVOKE_REGION_WIN, which we don't want here. */ uiLayoutSetOperatorContext(layout, WM_OP_INVOKE_DEFAULT); if (!ELEM(sa->spacetype, SPACE_TOPBAR)) { + uiItemS(layout); + uiItemO(layout, but_flip_str, ICON_NONE, "SCREEN_OT_region_flip"); } |