Revision: 21193
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21193
Author: blendix
Date: 2009-06-27 16:35:24 +0200 (Sat, 27 Jun 2009)
Log Message:
-----------
UI:
* Fix issue with icon not being left-aligned in text field.
* Put modifier tab after data tab in buttons header.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/interface/interface.c
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-06-27 14:07:17 UTC (rev 21192)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-06-27 14:35:24 UTC (rev 21193)
@@ -2077,13 +2077,10 @@
rgb_to_hsv(rgb[0], rgb[1], rgb[2], but->hsv, but->hsv+1,
but->hsv+2);
}
- if((block->flag & UI_BLOCK_LOOP) || ELEM7(but->type, MENU, TEX, LABEL,
IDPOIN, BLOCK, BUTM, SEARCH_MENU)) {
- but->flag |= UI_TEXT_LEFT;
- }
-
- if(but->type==BUT_TOGDUAL) {
+ if((block->flag & UI_BLOCK_LOOP) || ELEM7(but->type, MENU, TEX, LABEL,
IDPOIN, BLOCK, BUTM, SEARCH_MENU))
+ but->flag |= (UI_TEXT_LEFT|UI_ICON_LEFT);
+ else if(but->type==BUT_TOGDUAL)
but->flag |= UI_ICON_LEFT;
- }
but->flag |= (block->flag & UI_BUT_ALIGN);
Modified:
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
2009-06-27 14:07:17 UTC (rev 21192)
+++
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
2009-06-27 14:35:24 UTC (rev 21193)
@@ -173,10 +173,10 @@
uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,
ICON_OBJECT_DATA, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0,
(float)BCONTEXT_OBJECT, 0, 0, "Object");
if(sbuts->pathflag & (1<<BCONTEXT_CONSTRAINT))
uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,
ICON_CONSTRAINT, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0,
(float)BCONTEXT_CONSTRAINT, 0, 0, "Constraint");
+ if(sbuts->pathflag & (1<<BCONTEXT_DATA))
+ uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,
sbuts->dataicon, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0,
(float)BCONTEXT_DATA, 0, 0, "Object Data");
if(sbuts->pathflag & (1<<BCONTEXT_MODIFIER))
uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_MODIFIER,
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_MODIFIER, 0, 0,
"Modifier");
- if(sbuts->pathflag & (1<<BCONTEXT_DATA))
- uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,
sbuts->dataicon, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0,
(float)BCONTEXT_DATA, 0, 0, "Object Data");
if(sbuts->pathflag & (1<<BCONTEXT_BONE))
uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_BONE_DATA,
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_BONE, 0, 0,
"Bone");
if(sbuts->pathflag & (1<<BCONTEXT_MATERIAL))
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
