From 7e5a6ec482e6ffa561a62a0dfd479ae707fdc4df Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Tue, 22 Jul 2003 12:49:32 +0000 Subject: [PATCH] - tinsy bit toned down new color for rvk sliders, to match the blender scheme - restored commented out test_view2d() call in changeactionspace(). this fixes the errors when opening a new or larger action window, with wrong layout/matrices (HOS: can you verify that doesnt break stuff?) --- source/blender/src/drawaction.c | 4 ++-- source/blender/src/space.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c index 482fb4448e6..fbb24c48d5f 100644 --- a/source/blender/src/drawaction.c +++ b/source/blender/src/drawaction.c @@ -119,7 +119,7 @@ void meshactionbuts(SpaceAction *saction, Key *key) uiBlock *block; uiBut *but; short ofsx, ofsy = 0; -#define RVKBGCOL .6, .6, .8 +#define RVKBGCOL .6, .65, .7 #define XIC 20 #define YIC 20 @@ -139,7 +139,7 @@ void meshactionbuts(SpaceAction *saction, Key *key) y = key->totkey*(CHANNELHEIGHT+CHANNELSKIP) - CHANNELHEIGHT/2 - G.v2d->cur.ymin; - uiBlockSetCol(block, BUTPURPLE); + uiBlockSetCol(block, BUTGREY); /* make the little 'open the sliders' widget */ glColor3f(RVKBGCOL); diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 624b19ffff6..52e88f20fef 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -2375,9 +2375,10 @@ static void changeactionspace(ScrArea *sa, void *spacedata) { if(G.v2d==0) return; - /* action space uses weird matrices... local calculated in a function */ + /* this sets the sub-areas correct, for scrollbars */ + test_view2d(G.v2d, curarea->winx, curarea->winy); - // test_view2d(G.v2d, curarea->winx, curarea->winy); + /* action space uses weird matrices... local calculated in a function */ // myortho2(G.v2d->cur.xmin, G.v2d->cur.xmax, G.v2d->cur.ymin, G.v2d->cur.ymax); }