Revision: 29638 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29638 Author: dfelinto Date: 2010-06-23 08:09:30 +0200 (Wed, 23 Jun 2010)
Log Message: ----------- Logic UI: small change: make pin always visible (disable sometimes instead of hiding) I still think we could use a more compact header for the non-expanded mode (ala 2.49). To be addressed later Modified Paths: -------------- trunk/blender/source/blender/editors/space_logic/logic_window.c Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c =================================================================== --- trunk/blender/source/blender/editors/space_logic/logic_window.c 2010-06-23 05:56:18 UTC (rev 29637) +++ trunk/blender/source/blender/editors/space_logic/logic_window.c 2010-06-23 06:09:30 UTC (rev 29638) @@ -3174,7 +3174,7 @@ static void draw_sensor_header(uiLayout *layout, PointerRNA *ptr, PointerRNA *logic_ptr) { - uiLayout *box, *row; + uiLayout *box, *row, *subrow; box= uiLayoutBox(layout); row= uiLayoutRow(box, 0); @@ -3183,9 +3183,10 @@ uiItemR(row, ptr, "type", 0, "", 0); uiItemR(row, ptr, "name", 0, "", 0); - // XXX in 2.49 we make the pin to dis/appear. In 2.50 may be better to simply enable/disable it - if (RNA_boolean_get(logic_ptr, "sensors_show_active_states") && (RNA_boolean_get(ptr, "expanded") || RNA_boolean_get(ptr, "pinned"))) - uiItemR(row, ptr, "pinned", UI_ITEM_R_NO_BG, "", 0); + subrow= uiLayoutRow(row, 0); + uiLayoutSetActive(subrow, (RNA_boolean_get(logic_ptr, "sensors_show_active_states") + && RNA_boolean_get(ptr, "expanded") || RNA_boolean_get(ptr, "pinned"))); + uiItemR(subrow, ptr, "pinned", UI_ITEM_R_NO_BG, "", 0); uiItemO(row, "", ICON_X, "LOGIC_OT_sensor_remove"); } @@ -3591,7 +3592,7 @@ /* Actuator code */ static void draw_actuator_header(uiLayout *layout, PointerRNA *ptr, PointerRNA *logic_ptr) { - uiLayout *box, *row; + uiLayout *box, *row, *subrow; box= uiLayoutBox(layout); row= uiLayoutRow(box, 0); @@ -3600,9 +3601,10 @@ uiItemR(row, ptr, "type", 0, "", 0); uiItemR(row, ptr, "name", 0, "", 0); - // XXX in 2.49 we make the pin to dis/appear. In 2.50 may be better to simply enable/disable it - if (RNA_boolean_get(logic_ptr, "actuators_show_active_states") && (RNA_boolean_get(ptr, "expanded") || RNA_boolean_get(ptr, "pinned"))) - uiItemR(row, ptr, "pinned", UI_ITEM_R_NO_BG, "", 0); + subrow= uiLayoutRow(row, 0); + uiLayoutSetActive(subrow, (RNA_boolean_get(logic_ptr, "actuators_show_active_states") + && RNA_boolean_get(ptr, "expanded") || RNA_boolean_get(ptr, "pinned"))); + uiItemR(subrow, ptr, "pinned", UI_ITEM_R_NO_BG, "", 0); uiItemO(row, "", ICON_X, "LOGIC_OT_actuator_remove"); } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs