[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53359] trunk/blender/source/blender: style cleanup: var naming for ui list
Campbell Barton
ideasman42 at gmail.com
Fri Dec 28 11:32:51 CET 2012
Revision: 53359
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53359
Author: campbellbarton
Date: 2012-12-28 10:32:49 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
style cleanup: var naming for ui list
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/makesdna/DNA_screen_types.h
trunk/blender/source/blender/makesrna/intern/rna_ui.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-12-28 10:23:06 UTC (rev 53358)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-12-28 10:32:49 UTC (rev 53359)
@@ -5832,7 +5832,7 @@
static void direct_link_region(FileData *fd, ARegion *ar, int spacetype)
{
Panel *pa;
- uiList *uilst;
+ uiList *ui_list;
link_list(fd, &ar->panels);
@@ -5843,10 +5843,10 @@
pa->type = NULL;
}
- link_list(fd, &ar->uiLists);
+ link_list(fd, &ar->ui_lists);
- for (uilst = ar->uiLists.first; uilst; uilst = uilst->next) {
- uilst->type = NULL;
+ for (ui_list = ar->ui_lists.first; ui_list; ui_list = ui_list->next) {
+ ui_list->type = NULL;
}
ar->regiondata = newdataadr(fd, ar->regiondata);
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2012-12-28 10:23:06 UTC (rev 53358)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2012-12-28 10:32:49 UTC (rev 53359)
@@ -2395,7 +2395,7 @@
for (sa= sc->areabase.first; sa; sa= sa->next) {
SpaceLink *sl;
Panel *pa;
- uiList *uilst;
+ uiList *ui_list;
ARegion *ar;
writestruct(wd, DATA, "ScrArea", 1, sa);
@@ -2406,8 +2406,8 @@
for (pa= ar->panels.first; pa; pa= pa->next)
writestruct(wd, DATA, "Panel", 1, pa);
- for (uilst = ar->uiLists.first; uilst; uilst = uilst->next)
- writestruct(wd, DATA, "uiList", 1, uilst);
+ for (ui_list = ar->ui_lists.first; ui_list; ui_list = ui_list->next)
+ writestruct(wd, DATA, "uiList", 1, ui_list);
}
sl= sa->spacedata.first;
Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_interface.h 2012-12-28 10:23:06 UTC (rev 53358)
+++ trunk/blender/source/blender/editors/include/UI_interface.h 2012-12-28 10:32:49 UTC (rev 53359)
@@ -780,7 +780,7 @@
uiLayout *uiLayoutColumn(uiLayout *layout, int align);
uiLayout *uiLayoutColumnFlow(uiLayout *layout, int number, int align);
uiLayout *uiLayoutBox(uiLayout *layout);
-uiLayout *uiLayoutListBox(uiLayout *layout, struct uiList *uilst, struct PointerRNA *ptr, struct PropertyRNA *prop,
+uiLayout *uiLayoutListBox(uiLayout *layout, struct uiList *ui_list, struct PointerRNA *ptr, struct PropertyRNA *prop,
struct PointerRNA *actptr, struct PropertyRNA *actprop);
uiLayout *uiLayoutAbsolute(uiLayout *layout, int align);
uiLayout *uiLayoutSplit(uiLayout *layout, float percentage, int align);
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-12-28 10:23:06 UTC (rev 53358)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-12-28 10:32:49 UTC (rev 53359)
@@ -6095,9 +6095,9 @@
int value, min, max;
if (but && (event->val == KM_PRESS)) {
- uiList *uilst = but->custom_data;
+ uiList *ui_list = but->custom_data;
- if (uilst) {
+ if (ui_list) {
if (ELEM(event->type, UPARROWKEY, DOWNARROWKEY) ||
((ELEM(event->type, WHEELUPMOUSE, WHEELDOWNMOUSE) && event->alt)))
{
@@ -6109,12 +6109,12 @@
else
value++;
- CLAMP(value, 0, uilst->list_last_len - 1);
+ CLAMP(value, 0, ui_list->list_last_len - 1);
- if (value < uilst->list_scroll)
- uilst->list_scroll = value;
- else if (value >= uilst->list_scroll + uilst->list_size)
- uilst->list_scroll = value - uilst->list_size + 1;
+ if (value < ui_list->list_scroll)
+ ui_list->list_scroll = value;
+ else if (value >= ui_list->list_scroll + ui_list->list_size)
+ ui_list->list_scroll = value - ui_list->list_size + 1;
RNA_property_int_range(&but->rnapoin, but->rnaprop, &min, &max);
value = CLAMPIS(value, min, max);
@@ -6127,27 +6127,27 @@
}
else if (ELEM(event->type, WHEELUPMOUSE, WHEELDOWNMOUSE) && event->shift) {
/* silly replacement for proper grip */
- if (uilst->list_grip_size == 0)
- uilst->list_grip_size = uilst->list_size;
+ if (ui_list->list_grip_size == 0)
+ ui_list->list_grip_size = ui_list->list_size;
if (event->type == WHEELUPMOUSE)
- uilst->list_grip_size--;
+ ui_list->list_grip_size--;
else
- uilst->list_grip_size++;
+ ui_list->list_grip_size++;
- uilst->list_grip_size = MAX2(uilst->list_grip_size, 1);
+ ui_list->list_grip_size = MAX2(ui_list->list_grip_size, 1);
ED_region_tag_redraw(ar);
retval = WM_UI_HANDLER_BREAK;
}
else if (ELEM(event->type, WHEELUPMOUSE, WHEELDOWNMOUSE)) {
- if (uilst->list_last_len > uilst->list_size) {
+ if (ui_list->list_last_len > ui_list->list_size) {
/* list template will clamp */
if (event->type == WHEELUPMOUSE)
- uilst->list_scroll--;
+ ui_list->list_scroll--;
else
- uilst->list_scroll++;
+ ui_list->list_scroll++;
ED_region_tag_redraw(ar);
Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c 2012-12-28 10:23:06 UTC (rev 53358)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c 2012-12-28 10:32:49 UTC (rev 53359)
@@ -2308,13 +2308,13 @@
return (uiLayout *)ui_layout_box(layout, ROUNDBOX);
}
-uiLayout *uiLayoutListBox(uiLayout *layout, uiList *uilist, PointerRNA *ptr, PropertyRNA *prop, PointerRNA *actptr,
+uiLayout *uiLayoutListBox(uiLayout *layout, uiList *ui_list, PointerRNA *ptr, PropertyRNA *prop, PointerRNA *actptr,
PropertyRNA *actprop)
{
uiLayoutItemBx *box = ui_layout_box(layout, LISTBOX);
uiBut *but = box->roundbox;
- but->custom_data = uilist;
+ but->custom_data = ui_list;
but->rnasearchpoin = *ptr;
but->rnasearchprop = prop;
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c 2012-12-28 10:23:06 UTC (rev 53358)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c 2012-12-28 10:32:49 UTC (rev 53359)
@@ -2328,7 +2328,7 @@
/************************* List Template **************************/
-static void uilist_draw_item_default(struct uiList *uilst, struct bContext *UNUSED(C), struct uiLayout *layout,
+static void uilist_draw_item_default(struct uiList *ui_list, struct bContext *UNUSED(C), struct uiLayout *layout,
struct PointerRNA *UNUSED(dataptr), struct PointerRNA *itemptr, int icon,
struct PointerRNA *UNUSED(active_dataptr), const char *UNUSED(active_propname),
int UNUSED(index))
@@ -2340,7 +2340,7 @@
name = (namebuf) ? namebuf : "";
/* Simplest one! */
- switch (uilst->layout_type) {
+ switch (ui_list->layout_type) {
case UILST_LAYOUT_GRID:
uiItemL(layout, "", icon);
break;
@@ -2361,8 +2361,8 @@
PointerRNA *dataptr, const char *propname, PointerRNA *active_dataptr,
const char *active_propname, int rows, int maxrows, int layout_type)
{
- uiListType *ult;
- uiList *uilst = NULL;
+ uiListType *ui_list_type;
+ uiList *ui_list = NULL;
ARegion *ar;
uiListDrawItemFunc draw_item;
@@ -2373,7 +2373,7 @@
uiBlock *block, *subblock;
uiBut *but;
- char uilst_id[UI_MAX_NAME_STR];
+ char ui_list_id[UI_MAX_NAME_STR];
char numstr[32];
int rnaicon = ICON_NONE, icon = ICON_NONE;
int i = 0, activei = 0;
@@ -2428,31 +2428,31 @@
activei = RNA_property_int_get(active_dataptr, activeprop);
/* Find the uiList type. */
- ult = WM_uilisttype_find(listtype_name, FALSE);
+ ui_list_type = WM_uilisttype_find(listtype_name, FALSE);
- if (ult == NULL) {
+ if (ui_list_type == NULL) {
RNA_warning("List type %s not found", listtype_name);
return;
}
- draw_item = ult->draw_item ? ult->draw_item : uilist_draw_item_default;
+ draw_item = ui_list_type->draw_item ? ui_list_type->draw_item : uilist_draw_item_default;
/* Find or add the uiList to the current Region. */
/* We tag the list id with the list type... */
- BLI_snprintf(uilst_id, sizeof(uilst_id), "%s_%s", ult->idname, list_id ? list_id : "");
+ BLI_snprintf(ui_list_id, sizeof(ui_list_id), "%s_%s", ui_list_type->idname, list_id ? list_id : "");
ar = CTX_wm_region(C);
- uilst = BLI_findstring(&ar->uiLists, uilst_id, offsetof(uiList, list_id));
+ ui_list = BLI_findstring(&ar->ui_lists, ui_list_id, offsetof(uiList, list_id));
- if (!uilst) {
- uilst = MEM_callocN(sizeof(uiList), __func__);
- BLI_strncpy(uilst->list_id, uilst_id, sizeof(uilst->list_id));
- BLI_addtail(&ar->uiLists, uilst);
+ if (!ui_list) {
+ ui_list = MEM_callocN(sizeof(uiList), __func__);
+ BLI_strncpy(ui_list->list_id, ui_list_id, sizeof(ui_list->list_id));
+ BLI_addtail(&ar->ui_lists, ui_list);
}
/* Because we can't actually pass type across save&load... */
- uilst->type = ult;
- uilst->layout_type = layout_type;
+ ui_list->type = ui_list_type;
+ ui_list->layout_type = layout_type;
switch (layout_type) {
case UILST_LAYOUT_DEFAULT:
@@ -2461,11 +2461,11 @@
rows = 5;
if (maxrows == 0)
maxrows = 5;
- if (uilst->list_grip_size != 0)
- rows = uilst->list_grip_size;
+ if (ui_list->list_grip_size != 0)
+ rows = ui_list->list_grip_size;
/* layout */
- box = uiLayoutListBox(layout, uilst, dataptr, prop, active_dataptr, activeprop);
+ box = uiLayoutListBox(layout, ui_list, dataptr, prop, active_dataptr, activeprop);
row = uiLayoutRow(box, FALSE);
col = uiLayoutColumn(row, TRUE);
@@ -2477,21 +2477,21 @@
items = CLAMPIS(len, rows, MAX2(rows, maxrows));
/* if list length changes and active is out of view, scroll to it */
- if ((uilst->list_last_len != len) &&
- (activei < uilst->list_scroll || activei >= uilst->list_scroll + items)) {
- uilst->list_scroll = activei;
+ if ((ui_list->list_last_len != len) &&
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list