Bugfix #2602
Tooltips of buttons with menus (like for set constraint type) could popup still... and in wrong location even! Now it's a little bit tighter coded.
This commit is contained in:
parent
1dad1677d3
commit
8242c5db2b
@ -4045,6 +4045,8 @@ uiBlock *uiNewBlock(ListBase *lb, char *name, short dt, short font, short win)
|
|||||||
|
|
||||||
uiSetCurFont(block, font);
|
uiSetCurFont(block, font);
|
||||||
|
|
||||||
|
UIbuttip= NULL;
|
||||||
|
|
||||||
return block;
|
return block;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4298,7 +4300,7 @@ static int ui_auto_themecol(uiBut *but)
|
|||||||
case MENU:
|
case MENU:
|
||||||
case BUTM:
|
case BUTM:
|
||||||
// (weak!) detect if it is a blockloop
|
// (weak!) detect if it is a blockloop
|
||||||
if(UIbuttip) return TH_MENU_ITEM;
|
if(but->block->dt == UI_EMBOSSP) return TH_MENU_ITEM;
|
||||||
return TH_BUT_POPUP;
|
return TH_BUT_POPUP;
|
||||||
default:
|
default:
|
||||||
return TH_BUT_NEUTRAL;
|
return TH_BUT_NEUTRAL;
|
||||||
|
Loading…
Reference in New Issue
Block a user