[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21500] branches/blender2.5/blender/source /blender: 2.5:

[Brecht Van Lommel]

Revision: 21500
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21500
Author:   blendix
Date:     2009-07-10 20:10:40 +0200 (Fri, 10 Jul 2009)

Log Message:
-----------
2.5:

* Fix missing update when browsing to different text.
* Fix wrong spacing in font size 15 drawing in the text editor.
* Fix numbers not updating in color picker buttons.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
    branches/blender2.5/blender/source/blender/editors/space_text/text_draw.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c	2009-07-10 18:09:53 UTC (rev 21499)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c	2009-07-10 18:10:40 UTC (rev 21500)
@@ -1460,11 +1460,10 @@
 	// this updates button strings, is hackish... but button pointers are on stack of caller function
 
 	for(bt= block->buttons.first; bt; bt= bt->next) {
-		if(strcmp(bt->str, "Hex: ")==0) {
+		if(strcmp(bt->str, "Hex: ")==0)
 			strcpy(bt->poin, col);
-			ui_check_but(bt);
-			break;
-		}
+
+		ui_check_but(bt);
 	}
 }
 
@@ -1506,6 +1505,8 @@
 				ui_set_but_val(bt, hsv[2]);
 			}
 		}		
+
+		ui_check_but(bt);
 	}
 }
 
@@ -1547,6 +1548,8 @@
 				ui_set_but_val(bt, v);
 			}
 		}
+
+		ui_check_but(bt);
 	}
 }
 

Modified: branches/blender2.5/blender/source/blender/editors/space_text/text_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_text/text_draw.c	2009-07-10 18:09:53 UTC (rev 21499)
+++ branches/blender2.5/blender/source/blender/editors/space_text/text_draw.c	2009-07-10 18:10:40 UTC (rev 21500)
@@ -101,7 +101,7 @@
 int text_font_width_character(SpaceText *st)
 {
 	// XXX need quick BLF function, or cache it somewhere
-	return (st->lheight == 12)? 7: 8;
+	return (st->lheight == 12)? 7: 9;
 }
 
 int text_font_width(SpaceText *st, char *str)

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c	2009-07-10 18:09:53 UTC (rev 21499)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c	2009-07-10 18:10:40 UTC (rev 21500)
@@ -800,8 +800,8 @@
 	PropertyRNA *prop;
 
 	static EnumPropertyItem font_size_items[] = {
-		{12, "SCREEN_12", 0, "Screen 12", ""},
-		{15, "SCREEN_15", 0, "Screen 15", ""},
+		{12, "12", 0, "12", ""},
+		{15, "15", 0, "15", ""},
 		{0, NULL, 0, NULL, NULL}};
 
 	srna= RNA_def_struct(brna, "SpaceTextEditor", "Space");
@@ -813,7 +813,7 @@
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Text", "Text displayed and edited in this space.");
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_SpaceTextEditor_text_set", NULL);
-	RNA_def_property_update(prop, NC_TEXT|NA_EDITED, NULL);
+	RNA_def_property_update(prop, NC_TEXT|ND_DISPLAY, NULL);
 
 	/* display */
 	prop= RNA_def_property(srna, "syntax_highlight", PROP_BOOLEAN, PROP_NONE);