[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57771] trunk/blender/source/blender/ editors/interface: Fix #35880: popup menus like F6 redo did not use the right theme color for

[Brecht Van Lommel]

Revision: 57771
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57771
Author:   blendix
Date:     2013-06-26 12:24:36 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
Fix #35880: popup menus like F6 redo did not use the right theme color for
highlighted text, it should use the UI instead of 3D view color.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_regions.c
    trunk/blender/source/blender/editors/interface/resources.c

Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c  
2013-06-26 12:24:33 UTC (rev 57770)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c  
2013-06-26 12:24:36 UTC (rev 57771)
@@ -632,6 +632,7 @@
        memset(&type, 0, sizeof(ARegionType));
        type.draw = ui_tooltip_region_draw_cb;
        type.free = ui_tooltip_region_free_cb;
+       type.regionid = RGN_TYPE_TEMPORARY;
        ar->type = &type;
        
        /* set font, get bb */
@@ -1159,6 +1160,7 @@
        memset(&type, 0, sizeof(ARegionType));
        type.draw = ui_searchbox_region_draw_cb;
        type.free = ui_searchbox_region_free_cb;
+       type.regionid = RGN_TYPE_TEMPORARY;
        ar->type = &type;
        
        /* create searchbox data */
@@ -1669,6 +1671,7 @@
 
        memset(&type, 0, sizeof(ARegionType));
        type.draw = ui_block_region_draw;
+       type.regionid = RGN_TYPE_TEMPORARY;
        ar->type = &type;
 
        UI_add_region_handlers(&ar->handlers);

Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c  2013-06-26 
12:24:33 UTC (rev 57770)
+++ trunk/blender/source/blender/editors/interface/resources.c  2013-06-26 
12:24:36 UTC (rev 57771)
@@ -1014,17 +1014,24 @@
 
 void UI_SetTheme(int spacetype, int regionid)
 {
-       if (spacetype == 0) {  /* called for safety, when delete themes */
-               theme_active = U.themes.first;
-               theme_spacetype = SPACE_VIEW3D;
-               theme_regionid = RGN_TYPE_WINDOW;
-       }
-       else {
+       if (spacetype) {
                /* later on, a local theme can be found too */
                theme_active = U.themes.first;
                theme_spacetype = spacetype;
                theme_regionid = regionid;
        }
+       else if (regionid) {
+               /* popups */
+               theme_active = U.themes.first;
+               theme_spacetype = SPACE_BUTS;
+               theme_regionid = regionid;
+       }
+       else {
+               /* for safety, when theme was deleted */
+               theme_active = U.themes.first;
+               theme_spacetype = SPACE_VIEW3D;
+               theme_regionid = RGN_TYPE_WINDOW;
+       }
 }
 
 bTheme *UI_GetTheme(void)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs