diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-27 18:06:47 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-27 18:06:47 +0400 |
| commit | 7025f138948d15917fa4e8e469395eaebd32e6b3 (patch) | |
| tree | cd6838ae2548ade70d9fd5db7c953a42219124f6 /source/blender | |
| parent | 42d50c75faa70e99ba8452930ee7c0f86e1b64e2 (diff) | |
UI: tweak to panel header padding, made region expander a bit smaller and
fix bug #29422, left expander drawing over adjacent editor.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/interface/interface_panel.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/screen/area.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index d66e6852f1d..38b0c2f6d38 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -494,7 +494,7 @@ void ui_draw_aligned_panel(uiStyle *style, uiBlock *block, rcti *rect) /* calculate header rect */ /* + 0.001f to prevent flicker due to float inaccuracy */ headrect= *rect; - headrect.ymin= headrect.ymax - 2.0f/block->aspect; + headrect.ymin= headrect.ymax; headrect.ymax= headrect.ymin + floor(PNL_HEADER/block->aspect + 0.001f); { @@ -508,7 +508,7 @@ void ui_draw_aligned_panel(uiStyle *style, uiBlock *block, rcti *rect) /* draw with background color */ glEnable(GL_BLEND); glColor4ubv((unsigned char*)btheme->tui.panel.header); - glRectf(minx, headrect.ymin, maxx, y); + glRectf(minx, headrect.ymin+1, maxx, y); fdrawline(minx, y, maxx, y); fdrawline(minx, y, maxx, y); diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index f3d087d6986..24c26109502 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -262,12 +262,12 @@ static void region_draw_azone_tab_plus(AZone *az) break; } - glColor4f(0.05f, 0.05f, 0.05f, 0.5f); + glColor4f(0.05f, 0.05f, 0.05f, 0.4f); uiRoundBox((float)az->x1, (float)az->y1, (float)az->x2, (float)az->y2, 4.0f); glEnable(GL_BLEND); - glColor4f(0.8f, 0.8f, 0.8f, 0.5f); + glColor4f(0.8f, 0.8f, 0.8f, 0.4f); draw_azone_plus((float)az->x1, (float)az->y1, (float)az->x2, (float)az->y2); glDisable(GL_BLEND); @@ -711,8 +711,8 @@ static void region_azone_icon(ScrArea *sa, AZone *az, ARegion *ar) } } -#define AZONEPAD_TAB_PLUSW 16 -#define AZONEPAD_TAB_PLUSH 16 +#define AZONEPAD_TAB_PLUSW 14 +#define AZONEPAD_TAB_PLUSH 14 /* region already made zero sized, in shape of edge */ static void region_azone_tab_plus(ScrArea *sa, AZone *az, ARegion *ar) @@ -739,9 +739,9 @@ static void region_azone_tab_plus(ScrArea *sa, AZone *az, ARegion *ar) az->y2= ar->winrct.ymin; break; case AE_LEFT_TO_TOPRIGHT: - az->x1= ar->winrct.xmin + 1 - AZONEPAD_TAB_PLUSH; + az->x1= ar->winrct.xmin - AZONEPAD_TAB_PLUSH; az->y1= ar->winrct.ymax - 2.5*AZONEPAD_TAB_PLUSW; - az->x2= ar->winrct.xmin + 1; + az->x2= ar->winrct.xmin; az->y2= ar->winrct.ymax - 1.5*AZONEPAD_TAB_PLUSW; break; case AE_RIGHT_TO_TOPLEFT: |