Revision: 16362
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16362
Author: campbellbarton
Date: 2008-09-04 14:17:01 +0200 (Thu, 04 Sep 2008)
Log Message:
-----------
overlapping UI causing problems, forgot the label has a function assigned to it
Modified Paths:
--------------
trunk/blender/source/blender/src/buttons_logic.c
Modified: trunk/blender/source/blender/src/buttons_logic.c
===================================================================
--- trunk/blender/source/blender/src/buttons_logic.c 2008-09-04 12:11:47 UTC
(rev 16361)
+++ trunk/blender/source/blender/src/buttons_logic.c 2008-09-04 12:17:01 UTC
(rev 16362)
@@ -3398,7 +3398,7 @@
glRecti(xco+22, yco,
xco+width-22,yco+19);
but= uiDefBut(block, LABEL, 0,
sensor_name(sens->type), (short)(xco+22), yco, 80, 19, sens, 0, 0, 0, 0, "");
uiButSetFunc(but,
sca_move_sensor, sens, NULL);
- but= uiDefBut(block, LABEL, 0,
sens->name, (short)(xco+102), yco, (short)(width-124), 19, sens, 0, 31, 0, 0,
"");
+ but= uiDefBut(block, LABEL, 0,
sens->name, (short)(xco+102), yco, (short)(width-(pin?146:124)), 19, sens, 0,
31, 0, 0, "");
uiButSetFunc(but,
sca_move_sensor, sens, NULL);
}
@@ -3474,7 +3474,7 @@
glRecti((short)(xco+22), yco,
(short)(xco+width-22),(short)(yco+19));
but= uiDefBut(block, LABEL, 0,
actuator_name(act->type), (short)(xco+22), yco, 90, 19, act, 0, 0, 0, 0,
"Actuator type");
uiButSetFunc(but,
sca_move_actuator, act, NULL);
- but= uiDefBut(block, LABEL, 0,
act->name, (short)(xco+112), yco, (short)(width-156), 19, act, 0, 0, 0, 0,
"Actuator name");
+ but= uiDefBut(block, LABEL, 0,
act->name, (short)(xco+112), yco, (short)(width-(pin?156:134)), 19, act, 0, 0,
0, 0, "Actuator name");
uiButSetFunc(but,
sca_move_actuator, act, NULL);
ycoo= yco;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
