[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24028] trunk/blender/source/blender: Text Editor: Scrollbar now drawn on the right

[Joshua Leung]

Revision: 24028
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24028
Author:   aligorith
Date:     2009-10-21 00:51:20 +0200 (Wed, 21 Oct 2009)

Log Message:
-----------
Text Editor: Scrollbar now drawn on the right

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_text/text_draw.c
    trunk/blender/source/blender/editors/space_text/text_ops.c
    trunk/blender/source/blender/makesdna/DNA_text_types.h

Modified: trunk/blender/source/blender/editors/space_text/text_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_draw.c	2009-10-20 21:58:19 UTC (rev 24027)
+++ trunk/blender/source/blender/editors/space_text/text_draw.c	2009-10-20 22:51:20 UTC (rev 24028)
@@ -650,8 +650,10 @@
 	blank_lines = st->viewlines / 2;
 	
 	/* nicer code: use scroll rect for entire bar */
-	scroll->xmin= 5;
-	scroll->xmax= 17;
+	//scroll->xmin= 5;
+	//scroll->xmax= 17;
+	scroll->xmin= ar->winx - 17;
+	scroll->xmax= ar->winx - 5;
 	scroll->ymin= 4;
 	scroll->ymax= 4+pix_available;
 	
@@ -752,15 +754,6 @@
 	char col[3];
 	float rad;
 	
-//	UI_ThemeColorShade(TH_SHADE1, -20);
-//	glRecti(2, 2, 20, ar->winy-6);
-//	uiEmboss(2, 2, 20, ar->winy-6, 1);
-
-//	UI_ThemeColor(TH_SHADE1);
-//	glRecti(st->txtbar.xmin, st->txtbar.ymin, st->txtbar.xmax, st->txtbar.ymax);
-
-//	uiEmboss(st->txtbar.xmin, st->txtbar.ymin, st->txtbar.xmax, st->txtbar.ymax, st->flags & ST_SCROLL_SELECT);
-	
 	uiWidgetScrollDraw(&wcol, scroll, &st->txtbar, (st->flags & ST_SCROLL_SELECT)?UI_SCROLL_PRESSED:0);
 
 	uiSetRoundBox(15);

Modified: trunk/blender/source/blender/editors/space_text/text_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_ops.c	2009-10-20 21:58:19 UTC (rev 24027)
+++ trunk/blender/source/blender/editors/space_text/text_ops.c	2009-10-20 22:51:20 UTC (rev 24028)
@@ -1901,7 +1901,7 @@
 		return scroll_exec(C, op);
 	
 	/* verify we are in the right zone */
-	if(!(mval[0]>2 && mval[0]<20 && mval[1]>2 && mval[1]<ar->winy))
+	if(!(mval[0]>ar->winx-20 && mval[0]<ar->winx-2 && mval[1]>2 && mval[1]<ar->winy))
 		return OPERATOR_PASS_THROUGH;
 
 	tsc= MEM_callocN(sizeof(TextScroll), "TextScroll");

Modified: trunk/blender/source/blender/makesdna/DNA_text_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_text_types.h	2009-10-20 21:58:19 UTC (rev 24027)
+++ trunk/blender/source/blender/makesdna/DNA_text_types.h	2009-10-20 22:51:20 UTC (rev 24028)
@@ -70,8 +70,8 @@
 	double mtime;
 } Text;
 
-
-#define TXT_OFFSET 35
+	/* TXT_OFFSET used to be 35 when the scrollbar was on the left... */
+#define TXT_OFFSET 15
 #define TXT_TABSIZE	4
 #define TXT_INIT_UNDO 1024
 #define TXT_MAX_UNDO	(TXT_INIT_UNDO*TXT_INIT_UNDO)