From a0c9095620a2546e034e10b44b33d69dad2317c8 Mon Sep 17 00:00:00 2001 From: William Reynish Date: Thu, 21 Mar 2019 15:01:07 +0100 Subject: UI: Put camera composition guides in standard sub-panel Before we were using a very inconsistent toggle-menu for this. Just use standard UI here instead. --- .../startup/bl_ui/properties_data_camera.py | 38 +++++++++++++++++----- 1 file changed, 30 insertions(+), 8 deletions(-) (limited to 'release/scripts') diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py index 3a938ccd47e..1aea73a48eb 100644 --- a/release/scripts/startup/bl_ui/properties_data_camera.py +++ b/release/scripts/startup/bl_ui/properties_data_camera.py @@ -367,10 +367,6 @@ class DATA_PT_camera_display(CameraButtonsPanel, Panel): cam = context.camera - split = layout.split() - split.label() - split.prop_menu_enum(cam, "show_guide") - col = layout.column(align=True) col.separator() @@ -379,10 +375,35 @@ class DATA_PT_camera_display(CameraButtonsPanel, Panel): col.separator() - col.prop(cam, "show_limits", text="Limits") - col.prop(cam, "show_mist", text="Mist") - col.prop(cam, "show_sensor", text="Sensor") - col.prop(cam, "show_name", text="Name") + flow = layout.grid_flow(row_major=False, columns=0, even_columns=False, even_rows=False, align=False) + + flow.prop(cam, "show_limits", text="Limits") + flow.prop(cam, "show_mist", text="Mist") + flow.prop(cam, "show_sensor", text="Sensor") + flow.prop(cam, "show_name", text="Name") + +class DATA_PT_camera_display_composition_guides(CameraButtonsPanel, Panel): + bl_label = "Composition Guides" + bl_parent_id = "DATA_PT_camera_display" + bl_options = {'DEFAULT_CLOSED'} + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'} + + def draw(self, context): + layout = self.layout + layout.use_property_split = True + + cam = context.camera + + flow = layout.grid_flow(row_major=False, columns=0, even_columns=False, even_rows=False, align=False) + + flow.prop(cam, "composition_center") + flow.prop(cam, "composition_center_diagonal") + flow.prop(cam, "composition_thirds") + flow.prop(cam, "composition_golden") + flow.prop(cam, "composition_golden_tria_a") + flow.prop(cam, "composition_golden_tria_b") + flow.prop(cam, "composition_harmony_tri_a") + flow.prop(cam, "composition_harmony_tri_b") class DATA_PT_camera_display_passepartout(CameraButtonsPanel, Panel): @@ -503,6 +524,7 @@ classes = ( DATA_PT_camera_safe_areas_center_cut, DATA_PT_camera_background_image, DATA_PT_camera_display, + DATA_PT_camera_display_composition_guides, DATA_PT_camera_display_passepartout, DATA_PT_custom_props_camera, ) -- cgit v1.2.3