archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Text Editor: Scrollbar now drawn on the right

Browse Source
This commit is contained in:
Joshua Leung
2009-10-20 22:51:20 +00:00
parent 1224835188
commit ca87f28f5b
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/space_text/text_draw.c
View File

@@ -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);

2
source/blender/editors/space_text/text_ops.c
View File

@@ -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]<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");

4
source/blender/makesdna/DNA_text_types.h
View File

@@ -70,8 +70,8 @@ typedef struct Text {
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)