griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- increased tooltip back-grab safety one pixel

Browse Source 
- fixed good merging of constraint and effect panel in odd situations
This commit is contained in:
Ton Roosendaal
2003-10-29 19:23:51 +00:00
parent b232b1d3e5
commit d4a4f0e493
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/src/buttons_object.c
View File

@@ -793,7 +793,6 @@ static void object_panel_constraint(void)
char ownerstr[64];
block= uiNewBlock(&curarea->uiblocks, "object_panel_constraint", UI_EMBOSS, UI_HELV, curarea->win);
uiNewPanelTabbed("Effects", "Object");
if(uiNewPanel(curarea, block, "Constraints", "Object", 640, 0, 318, 204)==0) return;
/* this is a variable height panel, newpanel doesnt force new size on existing panels */
@@ -1327,6 +1326,7 @@ void object_panel_effects(Object *ob)
short x, y;
block= uiNewBlock(&curarea->uiblocks, "object_panel_effects", UI_EMBOSS, UI_HELV, curarea->win);
uiNewPanelTabbed("Constraints", "Object");
if(uiNewPanel(curarea, block, "Effects", "Object", 640, 0, 418, 204)==0) return;
/* EFFECTS */
@@ -1506,8 +1506,8 @@ void object_panels()
if(ob) {
object_panel_anim(ob);
object_panel_draw(ob);
if(ob->type==OB_MESH) object_panel_effects(ob);
object_panel_constraint();
if(ob->type==OB_MESH) object_panel_effects(ob);
}
}

2
source/blender/src/interface.c
View File

@@ -2794,7 +2794,7 @@ static uiSaveUnder *ui_draw_but_tip(uiBut *but)
y2 -= G.ui_international ? 5:1; //tip is from a windowheader
// else y2 += 1; //tip is from button area
su= ui_bgnpupdraw((int)(x1-1), (int)(y1-1), (int)(x2+4), (int)(y2+4), 0);
su= ui_bgnpupdraw((int)(x1-1), (int)(y1-2), (int)(x2+4), (int)(y2+4), 0);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);