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

UI: Remove Embossing

Browse Source 
We are using a different visual system to tell the areas apart.
There is no longer need for embossing.
This commit is contained in:
Dalai Felinto
2018-04-22 20:11:36 +02:00
parent 342d62291b
commit 3d62230ed6
1 changed files with 0 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
source/blender/editors/screen/area.c
View File

@@ -85,61 +85,6 @@ enum RegionEmbossSide {
/* general area and region code */ /* general area and region code */
static void region_draw_emboss(const ARegion *ar, const rcti *scirct, int sides)
{
rcti rect;
/* translate scissor rect to region space */
rect.xmin = scirct->xmin - ar->winrct.xmin;
rect.ymin = scirct->ymin - ar->winrct.ymin;
rect.xmax = scirct->xmax - ar->winrct.xmin;
rect.ymax = scirct->ymax - ar->winrct.ymin;
/* set transp line */
glEnable(GL_BLEND);
glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
Gwn_VertFormat *format = immVertexFormat();
unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
unsigned int color = GWN_vertformat_attr_add(format, "color", GWN_COMP_U8, 4, GWN_FETCH_INT_TO_FLOAT_UNIT);
immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
immBeginAtMost(GWN_PRIM_LINES, 8);
/* right */
if (sides & REGION_EMBOSS_RIGHT) {
immAttrib4ub(color, 0, 0, 0, 30);
immVertex2f(pos, rect.xmax, rect.ymax);
immVertex2f(pos, rect.xmax, rect.ymin);
}
/* bottom */
if (sides & REGION_EMBOSS_BOTTOM) {
immAttrib4ub(color, 0, 0, 0, 30);
immVertex2f(pos, rect.xmax, rect.ymin);
immVertex2f(pos, rect.xmin, rect.ymin);
}
/* left */
if (sides & REGION_EMBOSS_LEFT) {
immAttrib4ub(color, 255, 255, 255, 30);
immVertex2f(pos, rect.xmin, rect.ymin);
immVertex2f(pos, rect.xmin, rect.ymax);
}
/* top */
if (sides & REGION_EMBOSS_TOP) {
immAttrib4ub(color, 255, 255, 255, 30);
immVertex2f(pos, rect.xmin, rect.ymax);
immVertex2f(pos, rect.xmax, rect.ymax);
}
immEnd();
immUnbindProgram();
glDisable(GL_BLEND);
}
void ED_region_pixelspace(ARegion *ar) void ED_region_pixelspace(ARegion *ar)
{ {
wmOrtho2_region_pixelspace(ar); wmOrtho2_region_pixelspace(ar);
@@ -556,21 +501,6 @@ void ED_region_do_draw(bContext *C, ARegion *ar)
UI_blocklist_free_inactive(C, &ar->uiblocks); UI_blocklist_free_inactive(C, &ar->uiblocks);
if (sa) {
const bScreen *screen = WM_window_get_active_screen(win);
/* disable emboss when the area is full,
* unless we need to see division between regions (quad-split for eg) */
if (((screen->state == SCREENFULL) && (ar->alignment == RGN_ALIGN_NONE)) == 0) {
/* Don't draw horizontal separators in the top-bar to make the tabs
* look nice with the lower sub-bar. Obviously, a more generic
* solution would be preferable, e.g. a dedicated RGN_TYPE_TABS
* region type, but for now keeping it simple. */
int emboss_sides = ED_area_is_global(sa) ? (REGION_EMBOSS_LEFT | REGION_EMBOSS_RIGHT) : REGION_EMBOSS_ALL;
region_draw_emboss(ar, &ar->winrct, emboss_sides);
}
}
/* We may want to detach message-subscriptions from drawing. */ /* We may want to detach message-subscriptions from drawing. */
{ {
WorkSpace *workspace = CTX_wm_workspace(C); WorkSpace *workspace = CTX_wm_workspace(C);