diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-21 05:26:17 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-21 05:26:17 +0400 |
| commit | a78ef19054af921c536f647bd84ed9fd2636bfe0 (patch) | |
| tree | 47e5912921bf0b17832495d9eb525f75427de2b1 /source/blender/editors/include | |
| parent | f682de6fd2b4b64bc405f36f68c4024797b84492 (diff) | |
2.5: UI
* List template visual changes. Items now look different,
and it expands to size 5 as more items are added.
* Added LISTROW and LISTBOX elements. The former is like
a typical ROW button, but looks diffrent. The latter
looks like a BOUNDBOX, and has no extra features yet.
* Fix some glColor3ubv warnings with casting, did not find
a nicer way.
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/UI_interface.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 66089272737..2fec61fda3c 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -30,6 +30,8 @@ #ifndef UI_INTERFACE_H #define UI_INTERFACE_H +#include "RNA_types.h" + /* Struct Declarations */ struct ID; @@ -201,7 +203,9 @@ typedef struct uiLayout uiLayout; #define SEARCH_MENU (40<<9) #define BUT_EXTRA (41<<9) #define HSVCIRCLE (42<<9) -#define BUTTYPE (63<<9) +#define LISTBOX (43<<9) +#define LISTROW (44<<9) +#define BUTTYPE (63<<9) /* Drawing * @@ -588,7 +592,6 @@ void uiLayoutSetKeepAspect(uiLayout *layout, int keepaspect); void uiLayoutSetScaleX(uiLayout *layout, float scale); void uiLayoutSetScaleY(uiLayout *layout, float scale); - int uiLayoutGetOperatorContext(uiLayout *layout); int uiLayoutGetActive(uiLayout *layout); int uiLayoutGetEnabled(uiLayout *layout); @@ -597,12 +600,14 @@ int uiLayoutGetAlignment(uiLayout *layout); int uiLayoutGetKeepAspect(uiLayout *layout); float uiLayoutGetScaleX(uiLayout *layout); float uiLayoutGetScaleY(uiLayout *layout); +ListBase *uiLayoutBoxGetList(uiLayout *layout); /* layout specifiers */ uiLayout *uiLayoutRow(uiLayout *layout, int align); uiLayout *uiLayoutColumn(uiLayout *layout, int align); uiLayout *uiLayoutColumnFlow(uiLayout *layout, int number, int align); uiLayout *uiLayoutBox(uiLayout *layout); +uiLayout *uiLayoutListBox(uiLayout *layout); uiLayout *uiLayoutFree(uiLayout *layout, int align); uiLayout *uiLayoutSplit(uiLayout *layout, float percentage); @@ -619,11 +624,19 @@ void uiTemplateColorRamp(uiLayout *layout, struct ColorBand *coba, int expand); void uiTemplateCurveMapping(uiLayout *layout, struct CurveMapping *cumap, int type); void uiTemplateLayers(uiLayout *layout, struct PointerRNA *ptr, char *propname); void uiTemplateImageLayers(uiLayout *layout, struct bContext *C, struct Image *ima, struct ImageUser *iuser); -ListBase uiTemplateList(uiLayout *layout, struct PointerRNA *ptr, char *propname, struct PointerRNA *activeptr, char *activeprop, int rows, int columns, int compact); void uiTemplateRunningJobs(uiLayout *layout, struct bContext *C); void uiTemplateOperatorSearch(uiLayout *layout); void uiTemplateHeader3D(uiLayout *layout, struct bContext *C); +typedef struct uiListItem { + struct uiListItem *next, *prev; + + struct PointerRNA data; + uiLayout *layout; +} uiListItem; + +ListBase uiTemplateList(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, struct PointerRNA *activeptr, char *activeprop, int rows, int type); + /* items */ void uiItemO(uiLayout *layout, char *name, int icon, char *opname); void uiItemEnumO(uiLayout *layout, char *name, int icon, char *opname, char *propname, int value); |