[Bf-blender-cvs] [5f7c671c56d] blender2.8: UI: Tabs on right w/ right aligned regions
Campbell Barton
noreply at git.blender.org
Thu Sep 27 08:21:59 CEST 2018
Commit: 5f7c671c56d90adca4f49a769e2d6fee5a92f9a1
Author: Campbell Barton
Date: Thu Sep 27 16:21:57 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB5f7c671c56d90adca4f49a769e2d6fee5a92f9a1
UI: Tabs on right w/ right aligned regions
===================================================================
M source/blender/editors/interface/interface_panel.c
===================================================================
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index 53744e5e1b9..15ecbc1b03e 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -1015,7 +1015,7 @@ static bool uiAlignPanelStep(ScrArea *sa, ARegion *ar, const float fac, const bo
ps->pa->ofsy = -get_panel_size_y(ps->pa);
if (has_category_tabs) {
- if (align == BUT_VERTICAL) {
+ if (align == BUT_VERTICAL && (ar->alignment != RGN_ALIGN_RIGHT)) {
ps->pa->ofsx += UI_PANEL_CATEGORY_MARGIN_WIDTH;
}
}
@@ -1703,11 +1703,21 @@ void UI_panel_category_clear_all(ARegion *ar)
BLI_freelistN(&ar->panels_category);
}
+static void imm_buf_append(
+ float vbuf[][2],
+ uchar cbuf[][3],
+ float x, float y, const uchar col[3], int *index)
+{
+ ARRAY_SET_ITEMS(vbuf[*index], x, y);
+ ARRAY_SET_ITEMS(cbuf[*index], UNPACK3(col));
+ (*index)++;
+}
+
/* based on UI_draw_roundbox, check on making a version which allows us to skip some sides */
static void ui_panel_category_draw_tab(
bool filled, float minx, float miny, float maxx, float maxy, float rad,
- int roundboxtype,
- bool use_highlight, bool use_shadow,
+ const int roundboxtype,
+ const bool use_highlight, const bool use_shadow, const bool use_flip_x,
const unsigned char highlight_fade[3],
const unsigned char col[3])
{
@@ -1718,10 +1728,6 @@ static void ui_panel_category_draw_tab(
{0.98, 0.805}};
int a;
- GPUVertFormat *format = immVertexFormat();
- uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
- uint color = GPU_vertformat_attr_add(format, "color", GPU_COMP_U8, 3, GPU_FETCH_INT_TO_FLOAT_UNIT);
-
/* mult */
for (a = 0; a < 4; a++) {
mul_v2_fl(vec[a], rad);
@@ -1739,90 +1745,84 @@ static void ui_panel_category_draw_tab(
vert_len += (roundboxtype & UI_CNR_BOTTOM_RIGHT) ? 6 : 1;
vert_len += (roundboxtype & UI_CNR_BOTTOM_LEFT) ? 6 : 1;
}
-
- immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
-
- immBegin(filled ? GPU_PRIM_TRI_FAN : GPU_PRIM_LINE_STRIP, vert_len);
+ /* Maximum size. */
+ float vbuf[24][2];
+ uchar cbuf[24][3];
+ int buf_index = 0;
/* start with corner right-top */
if (use_highlight) {
if (roundboxtype & UI_CNR_TOP_RIGHT) {
- immAttrib3ubv(color, col);
- immVertex2f(pos, maxx, maxy - rad);
+ imm_buf_append(vbuf, cbuf, maxx, maxy - rad, col, &buf_index);
for (a = 0; a < 4; a++) {
- immAttrib3ubv(color, col);
- immVertex2f(pos, maxx - vec[a][1], maxy - rad + vec[a][0]);
+ imm_buf_append(vbuf, cbuf, maxx - vec[a][1], maxy - rad + vec[a][0], col, &buf_index);
}
- immAttrib3ubv(color, col);
- immVertex2f(pos, maxx - rad, maxy);
+ imm_buf_append(vbuf, cbuf, maxx - rad, maxy, col, &buf_index);
}
else {
- immAttrib3ubv(color, col);
- immVertex2f(pos, maxx, maxy);
+ imm_buf_append(vbuf, cbuf, maxx, maxy, col, &buf_index);
}
/* corner left-top */
if (roundboxtype & UI_CNR_TOP_LEFT) {
- immAttrib3ubv(color, col);
- immVertex2f(pos, minx + rad, maxy);
+ imm_buf_append(vbuf, cbuf, minx + rad, maxy, col, &buf_index);
for (a = 0; a < 4; a++) {
- immAttrib3ubv(color, col);
- immVertex2f(pos, minx + rad - vec[a][0], maxy - vec[a][1]);
+ imm_buf_append(vbuf, cbuf, minx + rad - vec[a][0], maxy - vec[a][1], col, &buf_index);
}
- immAttrib3ubv(color, col);
- immVertex2f(pos, minx, maxy - rad);
+ imm_buf_append(vbuf, cbuf, minx, maxy - rad, col, &buf_index);
}
else {
- immAttrib3ubv(color, col);
- immVertex2f(pos, minx, maxy);
+ imm_buf_append(vbuf, cbuf, minx, maxy, col, &buf_index);
}
}
if (use_highlight && !use_shadow) {
- if (highlight_fade) {
- immAttrib3ubv(color, highlight_fade);
+ imm_buf_append(vbuf, cbuf, minx, miny + rad, highlight_fade ? col : highlight_fade, &buf_index);
+ }
+ else {
+ /* corner left-bottom */
+ if (roundboxtype & UI_CNR_BOTTOM_LEFT) {
+ imm_buf_append(vbuf, cbuf, minx, miny + rad, col, &buf_index);
+ for (a = 0; a < 4; a++) {
+ imm_buf_append(vbuf, cbuf, minx + vec[a][1], miny + rad - vec[a][0], col, &buf_index);
+ }
+ imm_buf_append(vbuf, cbuf, minx + rad, miny, col, &buf_index);
}
else {
- immAttrib3ubv(color, col);
+ imm_buf_append(vbuf, cbuf, minx, miny, col, &buf_index);
}
- immVertex2f(pos, minx, miny + rad);
- immEnd();
- immUnbindProgram();
- return;
- }
- /* corner left-bottom */
- if (roundboxtype & UI_CNR_BOTTOM_LEFT) {
- immAttrib3ubv(color, col);
- immVertex2f(pos, minx, miny + rad);
- for (a = 0; a < 4; a++) {
- immAttrib3ubv(color, col);
- immVertex2f(pos, minx + vec[a][1], miny + rad - vec[a][0]);
+ /* corner right-bottom */
+ if (roundboxtype & UI_CNR_BOTTOM_RIGHT) {
+ imm_buf_append(vbuf, cbuf, maxx - rad, miny, col, &buf_index);
+ for (a = 0; a < 4; a++) {
+ imm_buf_append(vbuf, cbuf, maxx - rad + vec[a][0], miny + vec[a][1], col, &buf_index);
+ }
+ imm_buf_append(vbuf, cbuf, maxx, miny + rad, col, &buf_index);
+ }
+ else {
+ imm_buf_append(vbuf, cbuf, maxx, miny, col, &buf_index);
}
- immAttrib3ubv(color, col);
- immVertex2f(pos, minx + rad, miny);
- }
- else {
- immAttrib3ubv(color, col);
- immVertex2f(pos, minx, miny);
}
- /* corner right-bottom */
- if (roundboxtype & UI_CNR_BOTTOM_RIGHT) {
- immAttrib3ubv(color, col);
- immVertex2f(pos, maxx - rad, miny);
- for (a = 0; a < 4; a++) {
- immAttrib3ubv(color, col);
- immVertex2f(pos, maxx - rad + vec[a][0], miny + vec[a][1]);
+ if (use_flip_x) {
+ float midx = (minx + maxx) / 2.0f;
+ for (int i = 0; i < buf_index; i++) {
+ vbuf[i][0] = midx - (vbuf[i][0] - midx);
}
- immAttrib3ubv(color, col);
- immVertex2f(pos, maxx, miny + rad);
- }
- else {
- immAttrib3ubv(color, col);
- immVertex2f(pos, maxx, miny);
+
}
+ GPUVertFormat *format = immVertexFormat();
+ uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+ uint color = GPU_vertformat_attr_add(format, "color", GPU_COMP_U8, 3, GPU_FETCH_INT_TO_FLOAT_UNIT);
+
+ immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
+ immBegin(filled ? GPU_PRIM_TRI_FAN : GPU_PRIM_LINE_STRIP, vert_len);
+ for (int i = 0; i < buf_index; i++) {
+ immAttrib3ubv(color, cbuf[i]);
+ immVertex2fv(pos, vbuf[i]);
+ }
immEnd();
immUnbindProgram();
}
@@ -1836,21 +1836,23 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active)
{
/* no tab outlines for */
// #define USE_FLAT_INACTIVE
+ const bool is_left = (ar->alignment != RGN_ALIGN_RIGHT);
View2D *v2d = &ar->v2d;
uiStyle *style = UI_style_get();
const uiFontStyle *fstyle = &style->widget;
const int fontid = fstyle->uifont_id;
short fstyle_points = fstyle->points;
-
PanelCategoryDyn *pc_dyn;
const float aspect = ((uiBlock *)ar->uiblocks.first)->aspect;
const float zoom = 1.0f / aspect;
const int px = max_ii(1, round_fl_to_int(U.pixelsize));
+ const int px_x_sign = is_left ? px : -px;
const int category_tabs_width = round_fl_to_int(UI_PANEL_CATEGORY_MARGIN_WIDTH * zoom);
const float dpi_fac = UI_DPI_FAC;
const int tab_v_pad_text = round_fl_to_int((2 + ((px * 3) * dpi_fac)) * zoom); /* pading of tabs around text */
const int tab_v_pad = round_fl_to_int((4 + (2 * px * dpi_fac)) * zoom); /* padding between tabs */
const float tab_curve_radius = ((px * 3) * dpi_fac) * zoom;
+ /* We flip the tab drawing, so always use these flags. */
const int roundboxtype = UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT;
bool is_alpha;
bool do_scaletabs = false;
@@ -1859,8 +1861,9 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active)
#endif
float scaletabs = 1.0f;
/* same for all tabs */
- const int rct_xmin = v2d->mask.xmin + 3; /* intentionally dont scale by 'px' */
- const int rct_xmax = v2d->mask.xmin + category_tabs_width;
+ /* intentionally dont scale by 'px' */
+ const int rct_xmin = is_left ? v2d->mask.xmin + 3 : (v2d->mask.xmax - category_tabs_width);
+ const int rct_xmax = is_left ? v2d->mask.xmin + category_tabs_width : (v2d->mask.xmax - 3);
const int text_v_ofs = (rct_xmax - rct_xmin) * 0.3f;
int y_ofs = tab_v_pad;
@@ -1959,7 +1962,12 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active)
immUniformColor3ubv(theme_col_tab_bg);
}
- immRecti(pos, v2d->mask.xmin, v2d->mask.ymin, v2d->mask.xmin + category_tabs_width, v2d->mask.ymax);
+ if (is_left) {
+ immRecti(pos, v2d->mask.xmin, v2d->mask.ymin, v2d->mask.xmin + category_tabs_width, v2d->mask.ymax);
+ }
+ else {
+ immRecti(pos, v2d->mask.xmax - category_tabs_width, v2d->mask.ymin, v2d->mask.xmax, v2d->mask.ymax);
+ }
if (is_alpha) {
GPU_blend(false);
@@ -1967,6 +1975,11 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active)
immUnbindProgram();
+ const int divider_xmin =
+ is_left ? (v2d->mask.xmin + (category_tabs_width - px)) : (v2d->mask.xmax - category_tabs_width) + px;
+ const int divider_xmax =
+ is_left ? (v2d->mask.xmin + category_tabs_width) : (v2d->mask.xmax - (category_tabs_width + px)) + px;
+
for (pc_dyn = ar->panels_category.first; pc_dyn; pc_dyn = pc_dyn->next) {
const rcti *rct = &pc_dyn->rect;
const char *category_id = pc_dyn->idname;
@@ -1989,20 +2002,24 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active)
if (is_active)
#endif
{
+ const bool use_flip_x = !is_left;
ui_panel_category_draw_tab(
true, rct->xmin, rct->ymin, rct->xmax, rct->ymax,
- tab_curve_radius - px, roundboxtype, true, true, NULL,
+ tab_curve_radius - px, roundboxtype, true, true, use_flip_x,
+ NULL,
is_active ? theme_col_tab_active : theme_col_tab_inactive);
/* tab outline */
ui_panel_category_draw_tab(
- false, rct->xmin - px, rct->ymin - px, rct->xmax - px, rct->ymax + px,
- tab_curve_radius, roundboxtype, true, true, NULL, theme_col_tab_outline);
+ false, rct->xmin - px_x_sign, rct->ymin - px, rct->xmax - px_x_sign, rct->ymax + px,
+ tab_curve_radius, roundboxtype, true, true, use_flip_x,
+ NULL,
+ theme_col_tab_
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list