Blender Git Loki

Git Commits -> Revision 0570bdc

Revision 0570bdc by Bastien Montagne (master)
November 26, 2013, 09:41 (GMT)
Fix own regression in rB254aa8f3a0fb: Titles and sub-titles in menus were drawn shifted to the right.

Reported by plasmasolution over IRC, thanks.

Also fixes wrong handling of "sub-titles" with icons in EnumO menus (they were just treated as text-only ones).

Dev notes: in fact, that clean up commit revealed kind of an "hidden bug that happend to work well"
(or at least, a very bad hack): with titles without icon, code used to use uiItemL with ICON_NONE.
However, as the root layout is a menu one, internal ui code would add a dummy blank icon,
and set UI_HAS_ICON flag for the label button. But in the affected menus, code afterward assigned
UI_TEXT_LEFT to but->flag, thus erasing the (internal) UI_HAS_ICON. As UI_TEXT_LEFT was moved to
but->drawflag, the internal flag was no more erased, and the fake icon was drawn, creating that
shift-to-the-right effect. Turns out we do not even have to set UI_TEXT_LEFT in these cases,
just add label buttons without icon is enough!

Commit Details:

Full Hash: 0570bdc13d297a80c702a69f72bf28f8d4e2e9b5
Parent Commit: a6188af
Lines Changed: +20, -12

2 Modified Paths:

/source/blender/editors/interface/interface_layout.c (+9, -3) (Diff)
/source/blender/editors/interface/interface_regions.c (+11, -9) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021