minor changes to interface code (no functional changes)
authorCampbell Barton <ideasman42@gmail.com>
Tue, 27 Sep 2011 17:04:38 +0000 (17:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 27 Sep 2011 17:04:38 +0000 (17:04 +0000)
- made 2 loops on menu items break out of the loop when the item is found.
- include function names in error prints.

source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_regions.c
source/blender/editors/interface/interface_style.c

index 568eaf358e5749e63f258f109a27bead9afcb822..082ddb5b060c463c589128efcc54dab2c6df571c 100644 (file)
@@ -1684,7 +1684,7 @@ static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data)
                        /* not a file?, strip non utf-8 chars */
                        if(strip) {
                                /* 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);
                                                                }
                                                                else {
-                                                                       printf("Error, but->menu_key type: %d\n", but->type);
+                                                                       printf("%s: error, but->menu_key type: %d\n", __func__, but->type);
                                                                }
 
                                                                break;
index 5ea013ded59acd85333ec332a9a9e0d1f6b87251..fbad34252e726ea4ac5fb25fdae7ae121b52dee7 100644 (file)
@@ -752,7 +752,7 @@ int UI_icon_get_width(int icon_id)
        
        if (icon==NULL) {
                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;
        }
        
@@ -777,7 +777,7 @@ int UI_icon_get_height(int icon_id)
        
        if (icon==NULL) {
                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;
        }
        
@@ -825,7 +825,7 @@ static void icon_create_rect(struct PreviewImage* prv_img, enum eIconSizes size)
 
        if (!prv_img) {
                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]) {
                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 (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;
        }       
 
@@ -858,7 +858,7 @@ static void icon_draw_rect(float x, float y, int w, int h, float UNUSED(aspect),
 
        /* sanity check */
        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");
                return;
        }
@@ -948,7 +948,7 @@ static int get_draw_size(enum eIconSizes size)
        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;
        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 (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;
        }
 
index 4ecaec610531384e3c42ae126caae627b75eb4c1..bd77ab8065abad510595a892f4415270b1b268d0 100644 (file)
@@ -213,11 +213,13 @@ static MenuData *decompose_menu_string(const char *str)
                                nicon= 0;
                        }
                        
-                       if (c=='\0')
+                       if (c=='\0') {
                                break;
-               } else if (!nitem)
+                       }
+               } else if (!nitem) {
                        nitem= s;
-               
+               }
+
                s++;
        }
        
@@ -233,6 +235,7 @@ void ui_set_name_menu(uiBut *but, int value)
        for (i=0; i<md->nitems; i++) {
                if (md->items[i].retval==value) {
                        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 */
-       for(a=0, b=0; a<md->nitems; a++, b++) {
-               entry= &md->items[a];
-
-               if(entry->sepr && entry->str[0])
+       entry= md->items;
+       for(a=0; a<md->nitems; a++, entry++) {
+               if(entry->sepr && entry->str[0]) {
                        block->flag |= UI_BLOCK_NO_FLIP;
+                       break;
+               }
        }
 
        /* create items */
@@ -2555,7 +2559,7 @@ void uiPupMenuInvoke(bContext *C, const char *idname)
        MenuType *mt= WM_menutype_find(idname, TRUE);
 
        if(mt==NULL) {
-               printf("uiPupMenuInvoke: named menu \"%s\" not found\n", idname);
+               printf("%s: named menu \"%s\" not found\n", __func__, idname);
                return;
        }
 
index 3009d4fea092f95ced513987616b554e7681eef9..938fb27e01701c57d7f1c32db03548e68fae66d4 100644 (file)
@@ -357,7 +357,7 @@ void uiStyleInit(void)
 
                if (font->blf_id == -1) {
                        if (G.f & G_DEBUG)
-                               printf("uiStyleInit error, no fonts available\n");
+                               printf("%s: error, no fonts available\n", __func__);
                }
                else {
                        /* ? just for speed to initialize?