UI: Small Changes to Graph Editor Active Vertex Panel

  - X / Y value orders are all consistent, between handles and the keyframe.
  - Values are labeled consistently, with just "Frame" and "Value"
  - The more important type property that can affect the others comes first.
  - The "type" property provides nice visual separation between the
    handle properties.

Reviewed By: sybren, billreynish

Differential Revision: https://developer.blender.org/D7738

1 files changed, 38 insertions, 39 deletions

diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c
index ca8919f51a6..185bf029f1a 100644
--- a/source/blender/editors/space_graph/graph_buttons.c
+++ b/source/blender/editors/space_graph/graph_buttons.c
@@ -423,8 +423,7 @@ static void graph_panel_key_properties(const bContext *C, Panel *panel)
     col = uiLayoutColumn(layout, true);
     /* keyframe itself */
     {
-
-      uiItemL_respect_property_split(col, IFACE_("Key Value"), ICON_NONE);
+      uiItemL_respect_property_split(col, IFACE_("Key Frame"), ICON_NONE);
       but = uiDefButR(block,
                       UI_BTYPE_NUM,
                       B_REDR,
@@ -435,16 +434,14 @@ static void graph_panel_key_properties(const bContext *C, Panel *panel)
                       UI_UNIT_Y,
                       &bezt_ptr,
                       "co",
-                      1,
+                      0,
                       0,
                       0,
                       -1,
                       -1,
                       NULL);
-      UI_but_func_set(but, graphedit_activekey_update_cb, fcu, bezt);
-      UI_but_unit_type_set(but, unit);
 
-      uiItemL_respect_property_split(col, IFACE_("Frame"), ICON_NONE);
+      uiItemL_respect_property_split(col, IFACE_("Value"), ICON_NONE);
       but = uiDefButR(block,
                       UI_BTYPE_NUM,
                       B_REDR,
@@ -455,21 +452,42 @@ static void graph_panel_key_properties(const bContext *C, Panel *panel)
                       UI_UNIT_Y,
                       &bezt_ptr,
                       "co",
-                      0,
+                      1,
                       0,
                       0,
                       -1,
                       -1,
                       NULL);
       UI_but_func_set(but, graphedit_activekey_update_cb, fcu, bezt);
+      UI_but_unit_type_set(but, unit);
+
+      UI_but_func_set(but, graphedit_activekey_update_cb, fcu, bezt);
     }
 
     /* previous handle - only if previous was Bezier interpolation */
     if ((prevbezt) && (prevbezt->ipo == BEZT_IPO_BEZ)) {
 
       col = uiLayoutColumn(layout, true);
+      uiItemL_respect_property_split(col, IFACE_("Left Handle Type"), ICON_NONE);
+      but = uiDefButR(block,
+                      UI_BTYPE_MENU,
+                      B_REDR,
+                      NULL,
+                      0,
+                      0,
+                      but_max_width,
+                      UI_UNIT_Y,
+                      &bezt_ptr,
+                      "handle_left_type",
+                      0,
+                      0,
+                      0,
+                      -1,
+                      -1,
+                      "Type of left handle");
+      UI_but_func_set(but, graphedit_activekey_handles_cb, fcu, bezt);
 
-      uiItemL_respect_property_split(col, IFACE_("Left Handle X"), ICON_NONE);
+      uiItemL_respect_property_split(col, IFACE_("Frame"), ICON_NONE);
       but = uiDefButR(block,
                       UI_BTYPE_NUM,
                       B_REDR,
@@ -488,7 +506,7 @@ static void graph_panel_key_properties(const bContext *C, Panel *panel)
                       NULL);
       UI_but_func_set(but, graphedit_activekey_left_handle_coord_cb, fcu, bezt);
 
-      uiItemL_respect_property_split(col, IFACE_("Y"), ICON_NONE);
+      uiItemL_respect_property_split(col, IFACE_("Value"), ICON_NONE);
       but = uiDefButR(block,
                       UI_BTYPE_NUM,
                       B_REDR,
@@ -507,8 +525,14 @@ static void graph_panel_key_properties(const bContext *C, Panel *panel)
                       NULL);
       UI_but_func_set(but, graphedit_activekey_left_handle_coord_cb, fcu, bezt);
       UI_but_unit_type_set(but, unit);
+    }
+
+    /* next handle - only if current is Bezier interpolation */
+    if (bezt->ipo == BEZT_IPO_BEZ) {
+      /* NOTE: special update callbacks are needed on the coords here due to T39911 */
 
-      uiItemL_respect_property_split(col, IFACE_("Type"), ICON_NONE);
+      col = uiLayoutColumn(layout, true);
+      uiItemL_respect_property_split(col, IFACE_("Right Handle Type"), ICON_NONE);
       but = uiDefButR(block,
                       UI_BTYPE_MENU,
                       B_REDR,
@@ -518,22 +542,16 @@ static void graph_panel_key_properties(const bContext *C, Panel *panel)
                       but_max_width,
                       UI_UNIT_Y,
                       &bezt_ptr,
-                      "handle_left_type",
+                      "handle_right_type",
                       0,
                       0,
                       0,
                       -1,
                       -1,
-                      "Type of left handle");
+                      "Type of right handle");
       UI_but_func_set(but, graphedit_activekey_handles_cb, fcu, bezt);
-    }
 
-    /* next handle - only if current is Bezier interpolation */
-    if (bezt->ipo == BEZT_IPO_BEZ) {
-      /* NOTE: special update callbacks are needed on the coords here due to T39911 */
-
-      col = uiLayoutColumn(layout, true);
-      uiItemL_respect_property_split(col, IFACE_("Right Handle X"), ICON_NONE);
+      uiItemL_respect_property_split(col, IFACE_("Frame"), ICON_NONE);
       but = uiDefButR(block,
                       UI_BTYPE_NUM,
                       B_REDR,
@@ -552,7 +570,7 @@ static void graph_panel_key_properties(const bContext *C, Panel *panel)
                       NULL);
       UI_but_func_set(but, graphedit_activekey_right_handle_coord_cb, fcu, bezt);
 
-      uiItemL_respect_property_split(col, IFACE_("Y"), ICON_NONE);
+      uiItemL_respect_property_split(col, IFACE_("Value"), ICON_NONE);
       but = uiDefButR(block,
                       UI_BTYPE_NUM,
                       B_REDR,
@@ -571,25 +589,6 @@ static void graph_panel_key_properties(const bContext *C, Panel *panel)
                       NULL);
       UI_but_func_set(but, graphedit_activekey_right_handle_coord_cb, fcu, bezt);
       UI_but_unit_type_set(but, unit);
-
-      uiItemL_respect_property_split(col, IFACE_("Type"), ICON_NONE);
-      but = uiDefButR(block,
-                      UI_BTYPE_MENU,
-                      B_REDR,
-                      NULL,
-                      0,
-                      0,
-                      but_max_width,
-                      UI_UNIT_Y,
-                      &bezt_ptr,
-                      "handle_right_type",
-                      0,
-                      0,
-                      0,
-                      -1,
-                      -1,
-                      "Type of right handle");
-      UI_but_func_set(but, graphedit_activekey_handles_cb, fcu, bezt);
     }
   }
   else {