blender
/
blender
135
425
Fork 607
Code Issues 6.2k Pull Requests 779 Projects 19 Wiki Activity

UI: Demonstration of Non-Obscuring Area Borders #115251

Open
Harley Acheson wants to merge 12 commits from Harley/blender:AreaBorders into main
pull from: Harley/blender:AreaBorders
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 12 Files Changed 11 +6 -21
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 085e8ce63f - Show all commits

2
release/datafiles/userdef/userdef_default_theme.c
View File

@ -109,7 +109,7 @@ const bTheme U_theme_default = {
.wcol_tab = {
.outline = RGBA(0x1d1d1d00),
.inner = RGBA(0x1d1d1d00),
.inner_sel = RGBA(0x30303000),
.inner_sel = RGBA(0xffffff15),
.item = RGBA(0x1d1d1dff),
.text = RGBA(0x989898ff),
.text_sel = RGBA(0xffffffff),

23
source/blender/editors/screen/screen_draw.cc
View File

@ -95,31 +95,16 @@ void ED_screen_draw_edges(wmWindow *win)
immUniformThemeColor(TH_EDITOR_OUTLINE);
immUniformColor4fv(color);
float border_highlight[4] = {1.0f, 1.0f, 1.0f, 0.06f};
float border_lowlight[4] = {0.0f, 0.0f, 0.0f, 0.2f};
float border_highlight2[4] = {1.0f, 1.0f, 1.0f, 0.12f};
float border_lowlight2[4] = {0.0f, 0.0f, 0.0f, 0.4f};
float border_highlight[4] = {1.0f, 1.0f, 1.0f, 0.05f};
float border_highlight2[4] = {1.0f, 1.0f, 1.0f, 0.1f};
float half_line = U.pixelsize / 2.0f;
LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
rctf rectf = {float(area->totrct.xmin) - 2.0f,
float(area->totrct.xmax) + half_line,
float(area->totrct.ymin) - half_line,
float(area->totrct.ymax) + 2.0f};
UI_draw_roundbox_4fv_ex(&rectf,
nullptr,
nullptr,
1.0f,
(area == active_area) ? border_lowlight2 : border_lowlight,
U.pixelsize,
5.0f * UI_SCALE_FAC);
rctf rectf2 = {float(area->totrct.xmin) - half_line,
float(area->totrct.xmax) + 2.0f,
float(area->totrct.ymin) - 2.0f,
float(area->totrct.xmax) + 1.0f,
float(area->totrct.ymin) - 0.5f,
float(area->totrct.ymax) + half_line};
UI_draw_roundbox_4fv_ex(&rectf2,
nullptr,

2
source/blender/editors/screen/screen_ops.cc
View File

@ -1688,7 +1688,7 @@ static void area_move_set_limits(wmWindow *win,
LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
if (dir_axis == SCREEN_AXIS_H) {
int areamin = ED_area_headersize();
int areamin = ED_area_headersize() + BORDERWIDTH;
if (area->v1->vec.y > window_rect.ymin) {
areamin += U.pixelsize;