[Bf-blender-cvs] [9a77fb553c7] master: UI: remove redundant row for header template
Campbell Barton
noreply at git.blender.org
Sat Apr 20 20:55:18 CEST 2019
Commit: 9a77fb553c7aeb5a7dae24e53721b586142cc4f4
Author: Campbell Barton
Date: Sun Apr 21 04:49:19 2019 +1000
Branches: master
https://developer.blender.org/rB9a77fb553c7aeb5a7dae24e53721b586142cc4f4
UI: remove redundant row for header template
If it's members need to be aligned the template can handle it.
===================================================================
M release/scripts/startup/bl_ui/space_clip.py
M release/scripts/startup/bl_ui/space_dopesheet.py
M release/scripts/startup/bl_ui/space_graph.py
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_nla.py
M release/scripts/startup/bl_ui/space_node.py
M release/scripts/startup/bl_ui/space_outliner.py
M release/scripts/startup/bl_ui/space_properties.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_text.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index 59e74f96862..ffc047ed175 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -267,8 +267,7 @@ class CLIP_HT_header(Header):
sc = context.space_data
- row = layout.row(align=True)
- row.template_header()
+ layout.template_header()
layout.prop(sc, "mode", text="")
if sc.mode == 'TRACKING':
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index 61db70866e2..94f1292a3cc 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -210,8 +210,7 @@ class DOPESHEET_HT_header(Header):
st = context.space_data
- row = layout.row(align=True)
- row.template_header()
+ layout.template_header()
if st.mode == 'TIMELINE':
from .space_time import (
diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py
index eaa3d94babf..b71c0582dd9 100644
--- a/release/scripts/startup/bl_ui/space_graph.py
+++ b/release/scripts/startup/bl_ui/space_graph.py
@@ -34,8 +34,7 @@ class GRAPH_HT_header(Header):
st = context.space_data
- row = layout.row(align=True)
- row.template_header()
+ layout.template_header()
# Now a exposed as a sub-space type
# layout.prop(st, "mode", text="")
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 15a3f798c61..28edc6df3ce 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -513,7 +513,7 @@ class IMAGE_HT_tool_header(Header):
def draw(self, context):
layout = self.layout
- layout.row(align=True).template_header()
+ layout.template_header()
self.draw_tool_settings(context)
@@ -644,7 +644,7 @@ class IMAGE_HT_header(Header):
show_maskedit = sima.show_maskedit
if not sima.show_region_tool_header:
- layout.row(align=True).template_header()
+ layout.template_header()
if sima.mode != 'UV':
layout.prop(sima, "ui_mode", text="")
diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py
index 8c5c360de93..ba94769d2c0 100644
--- a/release/scripts/startup/bl_ui/space_nla.py
+++ b/release/scripts/startup/bl_ui/space_nla.py
@@ -33,8 +33,7 @@ class NLA_HT_header(Header):
st = context.space_data
- row = layout.row(align=True)
- row.template_header()
+ layout.template_header()
NLA_MT_editor_menus.draw_collapsible(context, layout)
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index caab7938c3e..f31b8def2c9 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -51,8 +51,7 @@ class NODE_HT_header(Header):
id_from = snode.id_from
tool_settings = context.tool_settings
- row = layout.row(align=True)
- row.template_header()
+ layout.template_header()
# Now expanded via the 'ui_type'
# layout.prop(snode, "tree_type", text="")
diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index 6107542c123..43907f985c0 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -32,8 +32,7 @@ class OUTLINER_HT_header(Header):
scene = context.scene
ks = context.scene.keying_sets.active
- row = layout.row(align=True)
- row.template_header()
+ layout.template_header()
layout.prop(space, "display_mode", icon_only=True)
diff --git a/release/scripts/startup/bl_ui/space_properties.py b/release/scripts/startup/bl_ui/space_properties.py
index 5cdcdaa0254..7d9ca687524 100644
--- a/release/scripts/startup/bl_ui/space_properties.py
+++ b/release/scripts/startup/bl_ui/space_properties.py
@@ -26,8 +26,7 @@ class PROPERTIES_HT_header(Header):
def draw(self, _context):
layout = self.layout
- row = layout.row()
- row.template_header()
+ layout.template_header()
class PROPERTIES_PT_navigation_bar(Panel):
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 942656f24b1..87ebf365a1e 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -83,8 +83,7 @@ class SEQUENCER_HT_header(Header):
st = context.space_data
scene = context.scene
- row = layout.row(align=True)
- row.template_header()
+ layout.template_header()
layout.prop(st, "view_type", text="")
diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py
index 3b5cc0ec652..0b83aca6fb4 100644
--- a/release/scripts/startup/bl_ui/space_text.py
+++ b/release/scripts/startup/bl_ui/space_text.py
@@ -31,8 +31,7 @@ class TEXT_HT_header(Header):
st = context.space_data
text = st.text
- row = layout.row(align=True)
- row.template_header()
+ layout.template_header()
TEXT_MT_editor_menus.draw_collapsible(context, layout)
More information about the Bf-blender-cvs
mailing list