archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

minor changes to interface code (no functional changes)

Browse Source 
- made 2 loops on menu items break out of the loop when the item is found.
- include function names in error prints.
This commit is contained in:
Campbell Barton
2011-09-27 17:04:38 +00:00
parent 3abfb2af43
commit 3bcbefa558
4 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/interface/interface_handlers.c
View File

@@ -1684,7 +1684,7 @@ static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data)
/* not a file?, strip non utf-8 chars */ /* not a file?, strip non utf-8 chars */
if(strip) { if(strip) {
/* wont happen often so isnt that annoying to keep it here for a while */ /* wont happen often so isnt that annoying to keep it here for a while */
printf("invalid utf8 - stripped chars %d\n", strip); printf("%s: invalid utf8 - stripped chars %d\n", __func__, strip);
} }
} }
@@ -5914,7 +5914,7 @@ static int ui_handle_menu_event(bContext *C, wmEvent *event, uiPopupBlockHandle
ui_handle_button_activate(C, ar, but, BUTTON_ACTIVATE); ui_handle_button_activate(C, ar, but, BUTTON_ACTIVATE);
} }
else { else {
printf("Error, but->menu_key type: %d\n", but->type); printf("%s: error, but->menu_key type: %d\n", __func__, but->type);
} }
break; break;

14
source/blender/editors/interface/interface_icons.c
View File

@@ -752,7 +752,7 @@ int UI_icon_get_width(int icon_id)
if (icon==NULL) { if (icon==NULL) {
if (G.f & G_DEBUG) if (G.f & G_DEBUG)
printf("UI_icon_get_width: Internal error, no icon for icon ID: %d\n", icon_id); printf("%s: Internal error, no icon for icon ID: %d\n", __func__, icon_id);
return 0; return 0;
} }
@@ -777,7 +777,7 @@ int UI_icon_get_height(int icon_id)
if (icon==NULL) { if (icon==NULL) {
if (G.f & G_DEBUG) if (G.f & G_DEBUG)
printf("UI_icon_get_height: Internal error, no icon for icon ID: %d\n", icon_id); printf("%s: Internal error, no icon for icon ID: %d\n", __func__, icon_id);
return 0; return 0;
} }
@@ -825,7 +825,7 @@ static void icon_create_rect(struct PreviewImage* prv_img, enum eIconSizes size)
if (!prv_img) { if (!prv_img) {
if (G.f & G_DEBUG) if (G.f & G_DEBUG)
printf("Error: requested preview image does not exist"); printf("%s, error: requested preview image does not exist", __func__);
} }
if (!prv_img->rect[size]) { if (!prv_img->rect[size]) {
prv_img->w[size] = render_size; prv_img->w[size] = render_size;
@@ -842,7 +842,7 @@ static void icon_set_image(bContext *C, ID *id, PreviewImage* prv_img, enum eIco
{ {
if (!prv_img) { if (!prv_img) {
if (G.f & G_DEBUG) if (G.f & G_DEBUG)
printf("No preview image for this ID: %s\n", id->name); printf("%s: no preview image for this ID: %s\n", __func__, id->name);
return; return;
} }
@@ -858,7 +858,7 @@ static void icon_draw_rect(float x, float y, int w, int h, float UNUSED(aspect),
/* sanity check */ /* sanity check */
if(w<=0 || h<=0 || w>2000 || h>2000) { if(w<=0 || h<=0 || w>2000 || h>2000) {
printf("icon_draw_rect: icons are %i x %i pixels?\n", w, h); printf("%s: icons are %i x %i pixels?\n", __func__, w, h);
BLI_assert(!"invalid icon size"); BLI_assert(!"invalid icon size");
return; return;
} }
@@ -948,7 +948,7 @@ static int get_draw_size(enum eIconSizes size)
return 0; return 0;
} }
static void icon_draw_size(float x, float y, int icon_id, float aspect, float alpha, float *rgb, enum eIconSizes size, int draw_size, int UNUSED(nocreate), int is_preview) static void icon_draw_size(float x, float y, int icon_id, float aspect, float alpha, float *rgb, enum eIconSizes size, int draw_size, int UNUSED(nocreate), short is_preview)
{ {
Icon *icon = NULL; Icon *icon = NULL;
DrawInfo *di = NULL; DrawInfo *di = NULL;
@@ -960,7 +960,7 @@ static void icon_draw_size(float x, float y, int icon_id, float aspect, float al
if (icon==NULL) { if (icon==NULL) {
if (G.f & G_DEBUG) if (G.f & G_DEBUG)
printf("icon_draw_mipmap: Internal error, no icon for icon ID: %d\n", icon_id); printf("%s: Internal error, no icon for icon ID: %d\n", __func__, icon_id);
return; return;
} }

18
source/blender/editors/interface/interface_regions.c
View File

@@ -213,10 +213,12 @@ static MenuData *decompose_menu_string(const char *str)
nicon= 0; nicon= 0;
} }
if (c=='\0') if (c=='\0') {
break; break;
} else if (!nitem) }
} else if (!nitem) {
nitem= s; nitem= s;
}
s++; s++;
} }
@@ -233,6 +235,7 @@ void ui_set_name_menu(uiBut *but, int value)
for (i=0; i<md->nitems; i++) { for (i=0; i<md->nitems; i++) {
if (md->items[i].retval==value) { if (md->items[i].retval==value) {
BLI_strncpy(but->drawstr, md->items[i].str, sizeof(but->drawstr)); BLI_strncpy(but->drawstr, md->items[i].str, sizeof(but->drawstr));
break;
} }
} }
@@ -1647,11 +1650,12 @@ static void ui_block_func_MENUSTR(bContext *UNUSED(C), uiLayout *layout, void *a
} }
/* inconsistent, but menus with labels do not look good flipped */ /* inconsistent, but menus with labels do not look good flipped */
for(a=0, b=0; a<md->nitems; a++, b++) { entry= md->items;
entry= &md->items[a]; for(a=0; a<md->nitems; a++, entry++) {
if(entry->sepr && entry->str[0]) {
if(entry->sepr && entry->str[0])
block->flag |= UI_BLOCK_NO_FLIP; block->flag |= UI_BLOCK_NO_FLIP;
break;
}
} }
/* create items */ /* create items */
@@ -2555,7 +2559,7 @@ void uiPupMenuInvoke(bContext *C, const char *idname)
MenuType *mt= WM_menutype_find(idname, TRUE); MenuType *mt= WM_menutype_find(idname, TRUE);
if(mt==NULL) { if(mt==NULL) {
printf("uiPupMenuInvoke: named menu \"%s\" not found\n", idname); printf("%s: named menu \"%s\" not found\n", __func__, idname);
return; return;
} }

2
source/blender/editors/interface/interface_style.c
View File

@@ -357,7 +357,7 @@ void uiStyleInit(void)
if (font->blf_id == -1) { if (font->blf_id == -1) {
if (G.f & G_DEBUG) if (G.f & G_DEBUG)
printf("uiStyleInit error, no fonts available\n"); printf("%s: error, no fonts available\n", __func__);
} }
else { else {
/* ? just for speed to initialize? /* ? just for speed to initialize?