2.5

Upgrading text editor to draw new scrollbar too.

5 files changed, 44 insertions, 23 deletions

diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index c0612c3524e..cc98d0fb3f3 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -214,6 +214,9 @@ void uiRoundRect(float minx, float miny, float maxx, float maxy, float rad);
 void uiDrawMenuBox(float minx, float miny, float maxx, float maxy, short flag, short direction);
 void uiDrawBoxShadow(unsigned char alpha, float minx, float miny, float maxx, float maxy);
 
+void uiWidgetScrollDraw(struct uiWidgetColors *wcol, rcti *rect, rcti *slider, int state);
+
+
 /* Menu Callbacks */
 
 typedef void (*uiMenuCreateFunc)(struct bContext *C, struct uiLayout *layout, void *arg1);
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index b2ba6fb38a8..1b16155c7e6 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -420,7 +420,6 @@ void ui_draw_anti_tria(float x1, float y1, float x2, float y2, float x3, float y
 void ui_draw_menu_back(struct uiStyle *style, uiBlock *block, rcti *rect);
 void ui_draw_search_back(struct uiStyle *style, uiBlock *block, rcti *rect);
 void ui_draw_link_bezier(rcti *rect);
-void widget_scroll_draw(struct uiWidgetColors *wcol, rcti *rect, rcti *slider, int state);
 
 extern void ui_draw_but(const struct bContext *C, ARegion *ar, struct uiStyle *style, uiBut *but, rcti *rect);
 		/* theme color init */
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 751a09ede49..b63c7f105c3 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1639,7 +1639,7 @@ void ui_draw_link_bezier(rcti *rect)
 }
 
 /* function in use for buttons and for view2d sliders */
-void widget_scroll_draw(uiWidgetColors *wcol, rcti *rect, rcti *slider, int state)
+void uiWidgetScrollDraw(uiWidgetColors *wcol, rcti *rect, rcti *slider, int state)
 {
 	uiWidgetBase wtb;
 	float rad;
@@ -1718,7 +1718,7 @@ static void widget_scroll(uiBut *but, uiWidgetColors *wcol, rcti *rect, int stat
 		rect1.ymin= rect1.ymax - ceil(fac*(but->a1 - but->softmin));
 	}
 
-	widget_scroll_draw(wcol, rect, &rect1, state);
+	uiWidgetScrollDraw(wcol, rect, &rect1, state);
 
 }
 
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c
index 38c854f432e..705963981c8 100644
--- a/source/blender/editors/interface/view2d.c
+++ b/source/blender/editors/interface/view2d.c
@@ -1461,7 +1461,7 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
 			slider.ymin= hor.ymin;
 			slider.ymax= hor.ymax;
 			
-			widget_scroll_draw(&wcol, &hor, &slider, (v2d->scroll_ui & V2D_SCROLL_H_ACTIVE)?UI_SELECT:0);
+			uiWidgetScrollDraw(&wcol, &hor, &slider, (v2d->scroll_ui & V2D_SCROLL_H_ACTIVE)?UI_SELECT:0);
 		}
 		
 		/* scale indicators */
@@ -1553,7 +1553,7 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
 			slider.ymin= vs->vert_min;
 			slider.ymax= vs->vert_max;
 			
-			widget_scroll_draw(&wcol, &vert, &slider, (v2d->scroll_ui & V2D_SCROLL_V_ACTIVE)?UI_SELECT:0);
+			uiWidgetScrollDraw(&wcol, &vert, &slider, (v2d->scroll_ui & V2D_SCROLL_V_ACTIVE)?UI_SELECT:0);
 		}
 		
 		
diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c
index 0dfe7c9e660..03b6a8dd862 100644
--- a/source/blender/editors/space_text/text_draw.c
+++ b/source/blender/editors/space_text/text_draw.c
@@ -41,6 +41,7 @@
 #include "DNA_text_types.h"
 #include "DNA_space_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_userdef_types.h"
 
 #include "BKE_global.h"
 #include "BKE_main.h"
@@ -701,7 +702,7 @@ static int text_draw(SpaceText *st, char *str, int cshift, int maxwidth, int dra
 
 /************************ draw scrollbar *****************************/
 
-static void calc_text_rcts(SpaceText *st, ARegion *ar)
+static void calc_text_rcts(SpaceText *st, ARegion *ar, rcti *scroll)
 {
 	int lhlstart, lhlend, ltexth;
 	short barheight, barstart, hlstart, hlend, blank_lines;
@@ -713,6 +714,12 @@ static void calc_text_rcts(SpaceText *st, ARegion *ar)
 	ltexth= txt_get_span(st->text->lines.first, st->text->lines.last);
 	blank_lines = st->viewlines / 2;
 	
+	/* nicer code: use scroll rect for entire bar */
+	scroll->xmin= 5;
+	scroll->xmax= 17;
+	scroll->ymin= 4;
+	scroll->ymax= 4+pix_available;
+	
 	/* when resizing a vieport with the bar at the bottom to a greater height more blank lines will be added */
 	if(ltexth + blank_lines < st->top + st->viewlines) {
 		blank_lines = st->top + st->viewlines - ltexth;
@@ -728,9 +735,8 @@ static void calc_text_rcts(SpaceText *st, ARegion *ar)
 	}
 	barstart = (ltexth > 0)? ((pix_available - pix_bardiff) * st->top)/ltexth: 0;
 
-	st->txtbar.xmin = 5;
-	st->txtbar.xmax = 17;
-	st->txtbar.ymax = ar->winy - pix_top_margin - barstart;
+	st->txtbar= *scroll;
+	st->txtbar.ymax -= barstart;
 	st->txtbar.ymin = st->txtbar.ymax - barheight;
 
 	CLAMP(st->txtbar.ymin, pix_bottom_margin, ar->winy - pix_top_margin);
@@ -796,8 +802,7 @@ static void calc_text_rcts(SpaceText *st, ARegion *ar)
 		hlend = hlstart + 2;
 	}
 	
-	st->txtscroll.xmin= 5;
-	st->txtscroll.xmax= 17;
+	st->txtscroll= *scroll;
 	st->txtscroll.ymax= ar->winy - pix_top_margin - hlstart;
 	st->txtscroll.ymin= ar->winy - pix_top_margin - hlend;
 
@@ -805,19 +810,31 @@ static void calc_text_rcts(SpaceText *st, ARegion *ar)
 	CLAMP(st->txtscroll.ymax, pix_bottom_margin, ar->winy - pix_top_margin);
 }
 
-static void draw_textscroll(SpaceText *st, ARegion *ar)
+static void draw_textscroll(SpaceText *st, ARegion *ar, rcti *scroll)
 {
-	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);
+	bTheme *btheme= U.themes.first;
+	uiWidgetColors wcol= btheme->tui.wcol_scroll;
+	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_SHADE2);
-	glRecti(st->txtscroll.xmin, st->txtscroll.ymin, st->txtscroll.xmax, st->txtscroll.ymax);
+//	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);
+//	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)?1:0);
+
+	uiSetRoundBox(15);
+	rad= 0.4f*MIN2(st->txtscroll.xmax - st->txtscroll.xmin, st->txtscroll.ymax - st->txtscroll.ymin);
+	UI_GetThemeColor3ubv(TH_HILITE, col);
+	glColor4ub(col[0], col[1], col[2], 48);
+	glEnable(GL_BLEND);
+	uiRoundBox(st->txtscroll.xmin+1, st->txtscroll.ymin, st->txtscroll.xmax-1, st->txtscroll.ymax, rad);
+	glDisable(GL_BLEND);
 }
 
 /************************** draw markers **************************/
@@ -1261,6 +1278,7 @@ void draw_text_main(SpaceText *st, ARegion *ar)
 {
 	Text *text= st->text;
 	TextLine *tmp;
+	rcti scroll;
 	char linenr[12];
 	int i, x, y, linecount= 0;
 
@@ -1276,7 +1294,7 @@ void draw_text_main(SpaceText *st, ARegion *ar)
 	else st->viewlines= 0;
 	
 	/* update rects for scroll */
-	calc_text_rcts(st, ar);
+	calc_text_rcts(st, ar, &scroll);	/* scroll will hold the entire bar size */
 
 	/* update syntax formatting if needed */
 	tmp= text->lines.first;
@@ -1343,7 +1361,8 @@ void draw_text_main(SpaceText *st, ARegion *ar)
 	/* draw other stuff */
 	draw_brackets(st, ar);
 	draw_markers(st, ar);
-	draw_textscroll(st, ar);
+	glTranslatef(0.375f, 0.375f, 0.0f); /* XXX scroll requires exact pixel space */
+	draw_textscroll(st, ar, &scroll);
 	draw_documentation(st, ar);
 	draw_suggestion_list(st, ar);