[Bf-blender-cvs] [0a3ce15] master: Revert "Quick fix for system info text always being scrolled out of view when loaded for the first time"

Campbell Barton noreply at git.blender.org
Sat Jan 4 15:13:38 CET 2014


Commit: 0a3ce15ce3c9eb1bed87eafdd2cfc4f37f40ad9f
Author: Campbell Barton
Date:   Sun Jan 5 01:12:48 2014 +1100
https://developer.blender.org/rB0a3ce15ce3c9eb1bed87eafdd2cfc4f37f40ad9f

Revert "Quick fix for system info text always being scrolled out of view when loaded for the first time"

This can be done without extending the API, using RNA access instead.

===================================================================

M	release/scripts/modules/sys_info.py
M	source/blender/makesrna/intern/rna_text_api.c

===================================================================

diff --git a/release/scripts/modules/sys_info.py b/release/scripts/modules/sys_info.py
index f284ba4..1785ab5 100644
--- a/release/scripts/modules/sys_info.py
+++ b/release/scripts/modules/sys_info.py
@@ -163,7 +163,4 @@ def write_sysinfo(op):
         for l in glext:
             output.write("\t\t%r\n" % (l))
 
-    # Back to first line, so everything is still in sight
-    output.jump(1)
-
     op.report({'INFO'}, "System information generated in 'system-info.txt'")
diff --git a/source/blender/makesrna/intern/rna_text_api.c b/source/blender/makesrna/intern/rna_text_api.c
index 4d88430..de398bc 100644
--- a/source/blender/makesrna/intern/rna_text_api.c
+++ b/source/blender/makesrna/intern/rna_text_api.c
@@ -50,20 +50,6 @@ static void rna_Text_write(Text *text, const char *str)
 	WM_main_add_notifier(NC_TEXT | NA_EDITED, text);
 }
 
-static void rna_Text_jump(Text *text, int line)
-{
-	short nlines = txt_get_span(text->lines.first, text->lines.last) + 1;
-	
-	if (line < 1)
-		txt_move_toline(text, 1, 0);
-	else if (line > nlines)
-		txt_move_toline(text, nlines - 1, 0);
-	else
-		txt_move_toline(text, line - 1, 0);
-		
-	WM_main_add_notifier(NC_TEXT | ND_CURSOR, text);
-}
-
 #else
 
 void RNA_api_text(StructRNA *srna)
@@ -75,15 +61,9 @@ void RNA_api_text(StructRNA *srna)
 	RNA_def_function_ui_description(func, "clear the text block");
 
 	func = RNA_def_function(srna, "write", "rna_Text_write");
-	RNA_def_function_ui_description(func, "Write text at the cursor location and advance to the end of the text block");
+	RNA_def_function_ui_description(func, "write text at the cursor location and advance to the end of the text block");
 	prop = RNA_def_string(func, "text", "Text", 0, "", "New text for this datablock");
 	RNA_def_property_flag(prop, PROP_REQUIRED);
-	
-	func = RNA_def_function(srna, "jump", "rna_Text_jump");
-	RNA_def_function_ui_description(func, "Move cursor location to the start of the specified line");
-	prop = RNA_def_int(func, "line_number", 1, 1, INT_MAX, "Line", "Line number to jump to", 1, 10000);
-	RNA_def_property_flag(prop, PROP_REQUIRED);
-	/* TODO: include optional parameter for character on line to jump to? */
 }
 
 #endif




More information about the Bf-blender-cvs mailing list