From 6aef124e7d2869a692dd564a4515f2304924da33 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 18 Apr 2019 12:16:03 +0200 Subject: UI: move region toggling to properties Each space had separate operators, duplicating logic. Use RNA properties instead so adding the ability to toggle other region types (floating redo region for eg) doesn't need to have an extra operator per space type. It's also nicer to show a check-box for something which can be toggled. --- source/blender/editors/space_view3d/CMakeLists.txt | 1 - .../blender/editors/space_view3d/view3d_buttons.c | 25 -------- .../blender/editors/space_view3d/view3d_intern.h | 1 - source/blender/editors/space_view3d/view3d_ops.c | 2 - .../blender/editors/space_view3d/view3d_toolbar.c | 67 ---------------------- 5 files changed, 96 deletions(-) delete mode 100644 source/blender/editors/space_view3d/view3d_toolbar.c (limited to 'source/blender/editors/space_view3d') diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index 279c6913064..1514f7a236b 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -64,7 +64,6 @@ set(SRC view3d_project.c view3d_select.c view3d_snap.c - view3d_toolbar.c view3d_utils.c view3d_view.c view3d_walk.c diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index abe36b1d563..987f09e049a 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -1628,31 +1628,6 @@ void view3d_buttons_register(ARegionType *art) WM_menutype_add(mt); } -static int view3d_properties_toggle_exec(bContext *C, wmOperator *UNUSED(op)) -{ - ScrArea *sa = CTX_wm_area(C); - ARegion *ar = view3d_has_buttons_region(sa); - - if (ar) { - ED_region_toggle_hidden(C, ar); - } - - return OPERATOR_FINISHED; -} - -void VIEW3D_OT_properties(wmOperatorType *ot) -{ - ot->name = "Toggle Sidebar"; - ot->description = "Toggle the properties region visibility"; - ot->idname = "VIEW3D_OT_properties"; - - ot->exec = view3d_properties_toggle_exec; - ot->poll = ED_operator_view3d_active; - - /* flags */ - ot->flag = 0; -} - static int view3d_object_mode_menu(bContext *C, wmOperator *op) { Object *ob = CTX_data_active_object(C); diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index fd306619577..4974e2269b3 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -234,7 +234,6 @@ void viewzoom_modal_keymap(struct wmKeyConfig *keyconf); void viewdolly_modal_keymap(struct wmKeyConfig *keyconf); /* view3d_buttons.c */ -void VIEW3D_OT_properties(struct wmOperatorType *ot); void VIEW3D_OT_object_mode_pie_or_toggle(struct wmOperatorType *ot); void view3d_buttons_register(struct ARegionType *art); diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 4e33005ebc0..e5a145b0411 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -199,9 +199,7 @@ void view3d_operatortypes(void) WM_operatortype_append(VIEW3D_OT_copybuffer); WM_operatortype_append(VIEW3D_OT_pastebuffer); - WM_operatortype_append(VIEW3D_OT_properties); WM_operatortype_append(VIEW3D_OT_object_mode_pie_or_toggle); - WM_operatortype_append(VIEW3D_OT_toolshelf); WM_operatortype_append(VIEW3D_OT_snap_selected_to_grid); WM_operatortype_append(VIEW3D_OT_snap_selected_to_cursor); diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c deleted file mode 100644 index 9357d3e05ee..00000000000 --- a/source/blender/editors/space_view3d/view3d_toolbar.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - */ - -/** \file - * \ingroup spview3d - */ - -#include -#include -#include -#include - -#include "DNA_scene_types.h" - -#include "BLI_utildefines.h" - -#include "BKE_context.h" - -#include "WM_api.h" -#include "WM_types.h" - -#include "ED_screen.h" - -#include "view3d_intern.h" /* own include */ - -/* ********** operator to open/close toolshelf region */ - -static int view3d_toolshelf_toggle_exec(bContext *C, wmOperator *UNUSED(op)) -{ - ScrArea *sa = CTX_wm_area(C); - ARegion *ar = view3d_has_tools_region(sa); - - if (ar) { - ED_region_toggle_hidden(C, ar); - } - - return OPERATOR_FINISHED; -} - -void VIEW3D_OT_toolshelf(wmOperatorType *ot) -{ - ot->name = "Toggle Toolbar"; - ot->description = "Toggles tool shelf display"; - ot->idname = "VIEW3D_OT_toolshelf"; - - ot->exec = view3d_toolshelf_toggle_exec; - ot->poll = ED_operator_view3d_active; - - /* flags */ - ot->flag = 0; -} -- cgit v1.2.3