[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51205] trunk/blender/source/blender/ editors/space_text/text_draw.c: patch [#31709] Text editor: scroll margin column along with text

[Campbell Barton]

Revision: 51205
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51205
Author:   campbellbarton
Date:     2012-10-09 06:15:07 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
patch [#31709] Text editor: scroll margin column along with text
by Sebastian Nell (codemanx)

The margin ignored horizontal scrolling. 

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_text/text_draw.c

Modified: trunk/blender/source/blender/editors/space_text/text_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_draw.c	2012-10-09 06:03:57 UTC (rev 51204)
+++ trunk/blender/source/blender/editors/space_text/text_draw.c	2012-10-09 06:15:07 UTC (rev 51205)
@@ -1741,6 +1741,7 @@
 	char linenr[12];
 	int i, x, y, winx, linecount = 0, lineno = 0;
 	int wraplinecount = 0, wrap_skip = 0;
+	int margin_column_x;
 
 	if (st->lheight) st->viewlines = (int)ar->winy / st->lheight;
 	else st->viewlines = 0;
@@ -1845,10 +1846,14 @@
 	if (st->flags & ST_SHOW_MARGIN) {
 		UI_ThemeColor(TH_HILITE);
 
-		glBegin(GL_LINES);
-		glVertex2i(x + st->cwidth * st->margin_column, 0);
-		glVertex2i(x + st->cwidth * st->margin_column, ar->winy - 2);
-		glEnd();
+		margin_column_x = x + st->cwidth * (st->margin_column - st->left);
+		
+		if (margin_column_x >= x) {
+			glBegin(GL_LINES);
+			glVertex2i(margin_column_x, 0);
+			glVertex2i(margin_column_x, ar->winy - 2);
+			glEnd();
+		}
 	}
 
 	/* draw other stuff */