From ca87f28f5bcb4811757631464a32a80fe91dbb41 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Tue, 20 Oct 2009 22:51:20 +0000 Subject: Text Editor: Scrollbar now drawn on the right --- source/blender/editors/space_text/text_draw.c | 15 ++++----------- source/blender/editors/space_text/text_ops.c | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) (limited to 'source/blender/editors/space_text') diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index 5996770c206..035c56005fe 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -650,8 +650,10 @@ static void calc_text_rcts(SpaceText *st, ARegion *ar, rcti *scroll) 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 @@ static void draw_textscroll(SpaceText *st, ARegion *ar, rcti *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_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); diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index a7b40deda22..09c74666b69 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -1901,7 +1901,7 @@ static int scroll_bar_invoke(bContext *C, wmOperator *op, wmEvent *event) return scroll_exec(C, op); /* verify we are in the right zone */ - if(!(mval[0]>2 && mval[0]<20 && mval[1]>2 && mval[1]winy)) + if(!(mval[0]>ar->winx-20 && mval[0]winx-2 && mval[1]>2 && mval[1]winy)) return OPERATOR_PASS_THROUGH; tsc= MEM_callocN(sizeof(TextScroll), "TextScroll"); -- cgit v1.2.3