archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Logic UI: small change: make pin always visible (disable sometimes instead of hiding)

Browse Source 
I still think we could use a more compact header for the non-expanded mode (ala 2.49). To be addressed later
This commit is contained in:
Dalai Felinto
2010-06-23 06:09:30 +00:00
parent ceac8d0fed
commit 5215e410c6
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/space_logic/logic_window.c
View File

@@ -3174,7 +3174,7 @@ static int is_sensor_linked(uiBlock *block, bSensor *sens)
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 @@ static void draw_sensor_header(uiLayout *layout, PointerRNA *ptr, PointerRNA *lo
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 @@ void draw_brick_controller(uiLayout *layout, PointerRNA *ptr)
/* 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 @@ static void draw_actuator_header(uiLayout *layout, PointerRNA *ptr, PointerRNA *
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");
}