Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
-rw-r--r--source/blender/editors/interface/interface_widgets.c8403
1 files changed, 4321 insertions, 4082 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 6528faca265..e18a2e6068a 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -64,73 +64,67 @@
/* visual types for drawing */
/* for time being separated from functional types */
typedef enum {
- /* default */
- UI_WTYPE_REGULAR,
-
- /* standard set */
- UI_WTYPE_LABEL,
- UI_WTYPE_TOGGLE,
- UI_WTYPE_CHECKBOX,
- UI_WTYPE_RADIO,
- UI_WTYPE_NUMBER,
- UI_WTYPE_SLIDER,
- UI_WTYPE_EXEC,
- UI_WTYPE_TOOLBAR_ITEM,
- UI_WTYPE_TAB,
- UI_WTYPE_TOOLTIP,
-
- /* strings */
- UI_WTYPE_NAME,
- UI_WTYPE_NAME_LINK,
- UI_WTYPE_POINTER_LINK,
- UI_WTYPE_FILENAME,
-
- /* menus */
- UI_WTYPE_MENU_RADIO,
- UI_WTYPE_MENU_ICON_RADIO,
- UI_WTYPE_MENU_POINTER_LINK,
- UI_WTYPE_MENU_NODE_LINK,
-
- UI_WTYPE_PULLDOWN,
- UI_WTYPE_MENU_ITEM,
- UI_WTYPE_MENU_ITEM_RADIAL,
- UI_WTYPE_MENU_BACK,
-
- /* specials */
- UI_WTYPE_ICON,
- UI_WTYPE_ICON_LABEL,
- UI_WTYPE_SWATCH,
- UI_WTYPE_RGB_PICKER,
- UI_WTYPE_UNITVEC,
- UI_WTYPE_BOX,
- UI_WTYPE_SCROLL,
- UI_WTYPE_LISTITEM,
- UI_WTYPE_PROGRESSBAR,
+ /* default */
+ UI_WTYPE_REGULAR,
+
+ /* standard set */
+ UI_WTYPE_LABEL,
+ UI_WTYPE_TOGGLE,
+ UI_WTYPE_CHECKBOX,
+ UI_WTYPE_RADIO,
+ UI_WTYPE_NUMBER,
+ UI_WTYPE_SLIDER,
+ UI_WTYPE_EXEC,
+ UI_WTYPE_TOOLBAR_ITEM,
+ UI_WTYPE_TAB,
+ UI_WTYPE_TOOLTIP,
+
+ /* strings */
+ UI_WTYPE_NAME,
+ UI_WTYPE_NAME_LINK,
+ UI_WTYPE_POINTER_LINK,
+ UI_WTYPE_FILENAME,
+
+ /* menus */
+ UI_WTYPE_MENU_RADIO,
+ UI_WTYPE_MENU_ICON_RADIO,
+ UI_WTYPE_MENU_POINTER_LINK,
+ UI_WTYPE_MENU_NODE_LINK,
+
+ UI_WTYPE_PULLDOWN,
+ UI_WTYPE_MENU_ITEM,
+ UI_WTYPE_MENU_ITEM_RADIAL,
+ UI_WTYPE_MENU_BACK,
+
+ /* specials */
+ UI_WTYPE_ICON,
+ UI_WTYPE_ICON_LABEL,
+ UI_WTYPE_SWATCH,
+ UI_WTYPE_RGB_PICKER,
+ UI_WTYPE_UNITVEC,
+ UI_WTYPE_BOX,
+ UI_WTYPE_SCROLL,
+ UI_WTYPE_LISTITEM,
+ UI_WTYPE_PROGRESSBAR,
} uiWidgetTypeEnum;
-
/* Button state argument shares bits with 'uiBut.flag'.
* reuse flags that aren't needed for drawing to avoid collision. */
enum {
- /* Show that holding the button opens a menu. */
- UI_STATE_HOLD_ACTION = UI_BUT_UPDATE_DELAY,
- UI_STATE_TEXT_INPUT = UI_BUT_UNDO,
- UI_STATE_ACTIVE_LEFT = UI_BUT_VALUE_CLEAR,
- UI_STATE_ACTIVE_RIGHT = UI_BUT_TEXTEDIT_UPDATE,
- UI_STATE_TEXT_BEFORE_WIDGET = UI_BUT_IMMEDIATE,
-
- UI_STATE_FLAGS_ALL = (
- UI_STATE_HOLD_ACTION |
- UI_STATE_TEXT_INPUT |
- UI_STATE_ACTIVE_LEFT |
- UI_STATE_ACTIVE_RIGHT |
- UI_STATE_TEXT_BEFORE_WIDGET),
+ /* Show that holding the button opens a menu. */
+ UI_STATE_HOLD_ACTION = UI_BUT_UPDATE_DELAY,
+ UI_STATE_TEXT_INPUT = UI_BUT_UNDO,
+ UI_STATE_ACTIVE_LEFT = UI_BUT_VALUE_CLEAR,
+ UI_STATE_ACTIVE_RIGHT = UI_BUT_TEXTEDIT_UPDATE,
+ UI_STATE_TEXT_BEFORE_WIDGET = UI_BUT_IMMEDIATE,
+
+ UI_STATE_FLAGS_ALL = (UI_STATE_HOLD_ACTION | UI_STATE_TEXT_INPUT | UI_STATE_ACTIVE_LEFT |
+ UI_STATE_ACTIVE_RIGHT | UI_STATE_TEXT_BEFORE_WIDGET),
};
/* Prevent accidental use. */
#define UI_BUT_UPDATE_DELAY ((void)0)
#define UI_BUT_UNDO ((void)0)
-
/* ************** widget base functions ************** */
/**
* - in: roundbox codes for corner types and radius
@@ -149,12 +143,12 @@ enum {
/* it has outline, back, and two optional tria meshes */
typedef struct uiWidgetTrias {
- uint tot;
- int type;
- float size, center[2];
+ uint tot;
+ int type;
+ float size, center[2];
- float vec[16][2];
- const uint (*index)[3];
+ float vec[16][2];
+ const uint (*index)[3];
} uiWidgetTrias;
@@ -164,19 +158,19 @@ typedef struct uiWidgetTrias {
#define WIDGET_SIZE_MAX (WIDGET_CURVE_RESOLU * 4)
typedef struct uiWidgetBase {
- /* TODO remove these completely */
- int totvert, halfwayvert;
- float outer_v[WIDGET_SIZE_MAX][2];
- float inner_v[WIDGET_SIZE_MAX][2];
- float inner_uv[WIDGET_SIZE_MAX][2];
+ /* TODO remove these completely */
+ int totvert, halfwayvert;
+ float outer_v[WIDGET_SIZE_MAX][2];
+ float inner_v[WIDGET_SIZE_MAX][2];
+ float inner_uv[WIDGET_SIZE_MAX][2];
- bool draw_inner, draw_outline, draw_emboss;
+ bool draw_inner, draw_outline, draw_emboss;
- uiWidgetTrias tria1;
- uiWidgetTrias tria2;
+ uiWidgetTrias tria1;
+ uiWidgetTrias tria2;
- /* Widget shader parameters, must match the shader layout. */
- uiWidgetBaseParameters uniform_params;
+ /* Widget shader parameters, must match the shader layout. */
+ uiWidgetBaseParameters uniform_params;
} uiWidgetBase;
/** uiWidgetType: for time being only for visual appearance,
@@ -184,35 +178,43 @@ typedef struct uiWidgetBase {
*/
typedef struct uiWidgetType {
- /* pointer to theme color definition */
- const uiWidgetColors *wcol_theme;
- uiWidgetStateColors *wcol_state;
+ /* pointer to theme color definition */
+ const uiWidgetColors *wcol_theme;
+ uiWidgetStateColors *wcol_state;
- /* converted colors for state */
- uiWidgetColors wcol;
+ /* converted colors for state */
+ uiWidgetColors wcol;
- void (*state)(struct uiWidgetType *, int state, int drawflag);
- void (*draw)(uiWidgetColors *, rcti *, int state, int roundboxalign);
- void (*custom)(uiBut *, uiWidgetColors *, rcti *, int state, int roundboxalign);
- void (*text)(const uiFontStyle *, const uiWidgetColors *, uiBut *, rcti *);
+ void (*state)(struct uiWidgetType *, int state, int drawflag);
+ void (*draw)(uiWidgetColors *, rcti *, int state, int roundboxalign);
+ void (*custom)(uiBut *, uiWidgetColors *, rcti *, int state, int roundboxalign);
+ void (*text)(const uiFontStyle *, const uiWidgetColors *, uiBut *, rcti *);
} uiWidgetType;
-
/* *********************** draw data ************************** */
static const float cornervec[WIDGET_CURVE_RESOLU][2] = {
- {0.0, 0.0}, {0.195, 0.02}, {0.383, 0.067},
- {0.55, 0.169}, {0.707, 0.293}, {0.831, 0.45},
- {0.924, 0.617}, {0.98, 0.805}, {1.0, 1.0},
+ {0.0, 0.0},
+ {0.195, 0.02},
+ {0.383, 0.067},
+ {0.55, 0.169},
+ {0.707, 0.293},
+ {0.831, 0.45},
+ {0.924, 0.617},
+ {0.98, 0.805},
+ {1.0, 1.0},
};
-
const float ui_pixel_jitter[UI_PIXEL_AA_JITTER][2] = {
- { 0.468813, -0.481430}, {-0.155755, -0.352820},
- { 0.219306, -0.238501}, {-0.393286, -0.110949},
- {-0.024699, 0.013908}, { 0.343805, 0.147431},
- {-0.272855, 0.269918}, { 0.095909, 0.388710},
+ {0.468813, -0.481430},
+ {-0.155755, -0.352820},
+ {0.219306, -0.238501},
+ {-0.393286, -0.110949},
+ {-0.024699, 0.013908},
+ {0.343805, 0.147431},
+ {-0.272855, 0.269918},
+ {0.095909, 0.388710},
};
#define WIDGET_AA_JITTER UI_PIXEL_AA_JITTER
#define jit ui_pixel_jitter
@@ -222,42 +224,81 @@ const float ui_pixel_jitter[UI_PIXEL_AA_JITTER][2] = {
* \{ */
static const float g_shape_preset_number_arrow_vert[3][2] = {
- {-0.352077, 0.532607}, {-0.352077, -0.549313}, {0.330000, -0.008353},
+ {-0.352077, 0.532607},
+ {-0.352077, -0.549313},
+ {0.330000, -0.008353},
};
static const uint g_shape_preset_number_arrow_face[1][3] = {
- {0, 1, 2},
+ {0, 1, 2},
};
static const float g_shape_preset_scroll_circle_vert[16][2] = {
- {0.382684, 0.923879}, {0.000001, 1.000000}, {-0.382683, 0.923880}, {-0.707107, 0.707107},
- {-0.923879, 0.382684}, {-1.000000, 0.000000}, {-0.923880, -0.382684}, {-0.707107, -0.707107},
- {-0.382683, -0.923880}, {0.000000, -1.000000}, {0.382684, -0.923880}, {0.707107, -0.707107},
- {0.923880, -0.382684}, {1.000000, -0.000000}, {0.923880, 0.382683}, {0.707107, 0.707107},
+ {0.382684, 0.923879},
+ {0.000001, 1.000000},
+ {-0.382683, 0.923880},
+ {-0.707107, 0.707107},
+ {-0.923879, 0.382684},
+ {-1.000000, 0.000000},
+ {-0.923880, -0.382684},
+ {-0.707107, -0.707107},
+ {-0.382683, -0.923880},
+ {0.000000, -1.000000},
+ {0.382684, -0.923880},
+ {0.707107, -0.707107},
+ {0.923880, -0.382684},
+ {1.000000, -0.000000},
+ {0.923880, 0.382683},
+ {0.707107, 0.707107},
};
static const uint g_shape_preset_scroll_circle_face[14][3] = {
- {0, 1, 2}, {2, 0, 3}, {3, 0, 15}, {3, 15, 4}, {4, 15, 14}, {4, 14, 5}, {5, 14, 13}, {5, 13, 6},
- {6, 13, 12}, {6, 12, 7}, {7, 12, 11}, {7, 11, 8}, {8, 11, 10}, {8, 10, 9},
+ {0, 1, 2},
+ {2, 0, 3},
+ {3, 0, 15},
+ {3, 15, 4},
+ {4, 15, 14},
+ {4, 14, 5},
+ {5, 14, 13},
+ {5, 13, 6},
+ {6, 13, 12},
+ {6, 12, 7},
+ {7, 12, 11},
+ {7, 11, 8},
+ {8, 11, 10},
+ {8, 10, 9},
};
static const float g_shape_preset_menu_arrow_vert[6][2] = {
- {-0.33, 0.16}, {0.33, 0.16}, {0, 0.82},
- {0, -0.82}, {-0.33, -0.16}, {0.33, -0.16},
+ {-0.33, 0.16},
+ {0.33, 0.16},
+ {0, 0.82},
+ {0, -0.82},
+ {-0.33, -0.16},
+ {0.33, -0.16},
};
static const uint g_shape_preset_menu_arrow_face[2][3] = {{2, 0, 1}, {3, 5, 4}};
static const float g_shape_preset_checkmark_vert[6][2] = {
- {-0.578579, 0.253369}, {-0.392773, 0.412794}, {-0.004241, -0.328551},
- {-0.003001, 0.034320}, {1.055313, 0.864744}, {0.866408, 1.026895},
+ {-0.578579, 0.253369},
+ {-0.392773, 0.412794},
+ {-0.004241, -0.328551},
+ {-0.003001, 0.034320},
+ {1.055313, 0.864744},
+ {0.866408, 1.026895},
};
static const uint g_shape_preset_checkmark_face[4][3] = {
- {3, 2, 4}, {3, 4, 5}, {1, 0, 3}, {0, 2, 3},
+ {3, 2, 4},
+ {3, 4, 5},
+ {1, 0, 3},
+ {0, 2, 3},
};
#define OY (-0.2 / 2)
#define SC (0.35 * 2)
static const float g_shape_preset_hold_action_vert[6][2] = {
- {-0.5 + SC, 1.0 + OY}, {0.5, 1.0 + OY}, {0.5, 0.0 + OY + SC},
+ {-0.5 + SC, 1.0 + OY},
+ {0.5, 1.0 + OY},
+ {0.5, 0.0 + OY + SC},
};
static const uint g_shape_preset_hold_action_face[2][3] = {{2, 0, 1}, {3, 5, 4}};
#undef OY
@@ -274,41 +315,42 @@ static const uint g_shape_preset_hold_action_face[2][3] = {{2, 0, 1}, {3, 5, 4}}
/* offset in triavec[] in shader per type */
static const int tria_ofs[ROUNDBOX_TRIA_MAX] = {
- [ROUNDBOX_TRIA_NONE] = 0,
- [ROUNDBOX_TRIA_ARROWS] = 0,
- [ROUNDBOX_TRIA_SCROLL] = 12,
- [ROUNDBOX_TRIA_MENU] = 28,
- [ROUNDBOX_TRIA_CHECK] = 34,
- [ROUNDBOX_TRIA_HOLD_ACTION_ARROW] = 40,
+ [ROUNDBOX_TRIA_NONE] = 0,
+ [ROUNDBOX_TRIA_ARROWS] = 0,
+ [ROUNDBOX_TRIA_SCROLL] = 12,
+ [ROUNDBOX_TRIA_MENU] = 28,
+ [ROUNDBOX_TRIA_CHECK] = 34,
+ [ROUNDBOX_TRIA_HOLD_ACTION_ARROW] = 40,
};
static const int tria_vcount[ROUNDBOX_TRIA_MAX] = {
- [ROUNDBOX_TRIA_NONE] = 0,
- [ROUNDBOX_TRIA_ARROWS] = 6,
- [ROUNDBOX_TRIA_SCROLL] = 16,
- [ROUNDBOX_TRIA_MENU] = 6,
- [ROUNDBOX_TRIA_CHECK] = 6,
- [ROUNDBOX_TRIA_HOLD_ACTION_ARROW] = 3,
+ [ROUNDBOX_TRIA_NONE] = 0,
+ [ROUNDBOX_TRIA_ARROWS] = 6,
+ [ROUNDBOX_TRIA_SCROLL] = 16,
+ [ROUNDBOX_TRIA_MENU] = 6,
+ [ROUNDBOX_TRIA_CHECK] = 6,
+ [ROUNDBOX_TRIA_HOLD_ACTION_ARROW] = 3,
};
static struct {
- GPUBatch *roundbox_widget[ROUNDBOX_TRIA_MAX];
+ GPUBatch *roundbox_widget[ROUNDBOX_TRIA_MAX];
- GPUBatch *roundbox_simple;
- GPUBatch *roundbox_simple_aa;
- GPUBatch *roundbox_simple_outline;
- GPUBatch *roundbox_shadow;
+ GPUBatch *roundbox_simple;
+ GPUBatch *roundbox_simple_aa;
+ GPUBatch *roundbox_simple_outline;
+ GPUBatch *roundbox_shadow;
- GPUVertFormat format;
- uint vflag_id;
+ GPUVertFormat format;
+ uint vflag_id;
} g_ui_batch_cache = {{0}};
static GPUVertFormat *vflag_format(void)
{
- if (g_ui_batch_cache.format.attr_len == 0) {
- GPUVertFormat *format = &g_ui_batch_cache.format;
- g_ui_batch_cache.vflag_id = GPU_vertformat_attr_add(format, "vflag", GPU_COMP_U32, 1, GPU_FETCH_INT);
- }
- return &g_ui_batch_cache.format;
+ if (g_ui_batch_cache.format.attr_len == 0) {
+ GPUVertFormat *format = &g_ui_batch_cache.format;
+ g_ui_batch_cache.vflag_id = GPU_vertformat_attr_add(
+ format, "vflag", GPU_COMP_U32, 1, GPU_FETCH_INT);
+ }
+ return &g_ui_batch_cache.format;
}
#define INNER 0
@@ -316,231 +358,236 @@ static GPUVertFormat *vflag_format(void)
#define EMBOSS 2
#define NO_AA WIDGET_AA_JITTER
-static void set_roundbox_vertex_data(
- GPUVertBufRaw *vflag_step, uint32_t d)
+static void set_roundbox_vertex_data(GPUVertBufRaw *vflag_step, uint32_t d)
{
- uint32_t *data = GPU_vertbuf_raw_step(vflag_step);
- *data = d;
+ uint32_t *data = GPU_vertbuf_raw_step(vflag_step);
+ *data = d;
}
-static uint32_t set_roundbox_vertex(
- GPUVertBufRaw *vflag_step,
- int corner_id, int corner_v, int jit_v, bool inner, bool emboss, int color)
+static uint32_t set_roundbox_vertex(GPUVertBufRaw *vflag_step,
+ int corner_id,
+ int corner_v,
+ int jit_v,
+ bool inner,
+ bool emboss,
+ int color)
{
- uint32_t *data = GPU_vertbuf_raw_step(vflag_step);
- *data = corner_id;
- *data |= corner_v << 2;
- *data |= jit_v << 6;
- *data |= color << 12;
- *data |= (inner) ? (1 << 10) : 0; /* is inner vert */
- *data |= (emboss) ? (1 << 11) : 0; /* is emboss vert */
- return *data;
+ uint32_t *data = GPU_vertbuf_raw_step(vflag_step);
+ *data = corner_id;
+ *data |= corner_v << 2;
+ *data |= jit_v << 6;
+ *data |= color << 12;
+ *data |= (inner) ? (1 << 10) : 0; /* is inner vert */
+ *data |= (emboss) ? (1 << 11) : 0; /* is emboss vert */
+ return *data;
}
static uint32_t set_tria_vertex(
- GPUVertBufRaw *vflag_step,
- int tria_type, int tria_v, int tria_id, int jit_v)
+ GPUVertBufRaw *vflag_step, int tria_type, int tria_v, int tria_id, int jit_v)
{
- uint32_t *data = GPU_vertbuf_raw_step(vflag_step);
- if (ELEM(tria_type, ROUNDBOX_TRIA_ARROWS)) {
- tria_v += tria_id * tria_vcount[ROUNDBOX_TRIA_ARROWS];
- }
- *data = tria_ofs[tria_type] + tria_v;
- *data |= jit_v << 6;
- *data |= (tria_id == 0) ? (1 << 10) : 0; /* is first tria */
- *data |= 1 << 14; /* is tria vert */
- return *data;
+ uint32_t *data = GPU_vertbuf_raw_step(vflag_step);
+ if (ELEM(tria_type, ROUNDBOX_TRIA_ARROWS)) {
+ tria_v += tria_id * tria_vcount[ROUNDBOX_TRIA_ARROWS];
+ }
+ *data = tria_ofs[tria_type] + tria_v;
+ *data |= jit_v << 6;
+ *data |= (tria_id == 0) ? (1 << 10) : 0; /* is first tria */
+ *data |= 1 << 14; /* is tria vert */
+ return *data;
}
static void roundbox_batch_add_tria(GPUVertBufRaw *vflag_step, int tria, uint32_t last_data)
{
- const int tria_num = ELEM(tria, ROUNDBOX_TRIA_CHECK, ROUNDBOX_TRIA_HOLD_ACTION_ARROW, ROUNDBOX_TRIA_MENU) ? 1 : 2;
- /* for each tria */
- for (int t = 0; t < tria_num; ++t) {
- for (int j = 0; j < WIDGET_AA_JITTER; j++) {
- /* restart */
- set_roundbox_vertex_data(vflag_step, last_data);
- set_tria_vertex(vflag_step, tria, 0, t, j);
- for (int v = 0; v < tria_vcount[tria]; v++) {
- last_data = set_tria_vertex(vflag_step, tria, v, t, j);
- }
- }
- }
+ const int tria_num =
+ ELEM(tria, ROUNDBOX_TRIA_CHECK, ROUNDBOX_TRIA_HOLD_ACTION_ARROW, ROUNDBOX_TRIA_MENU) ? 1 : 2;
+ /* for each tria */
+ for (int t = 0; t < tria_num; ++t) {
+ for (int j = 0; j < WIDGET_AA_JITTER; j++) {
+ /* restart */
+ set_roundbox_vertex_data(vflag_step, last_data);
+ set_tria_vertex(vflag_step, tria, 0, t, j);
+ for (int v = 0; v < tria_vcount[tria]; v++) {
+ last_data = set_tria_vertex(vflag_step, tria, v, t, j);
+ }
+ }
+ }
}
GPUBatch *ui_batch_roundbox_widget_get(int tria)
{
- if (g_ui_batch_cache.roundbox_widget[tria] == NULL) {
- uint32_t last_data;
- GPUVertBufRaw vflag_step;
- GPUVertBuf *vbo = GPU_vertbuf_create_with_format(vflag_format());
- int vcount = WIDGET_SIZE_MAX; /* inner */
- vcount += 2; /* restart */
- vcount += ((WIDGET_SIZE_MAX + 1) * 2) * WIDGET_AA_JITTER; /* outline (edges) */
- vcount += 2; /* restart */
- vcount += ((WIDGET_CURVE_RESOLU * 2) * 2) * WIDGET_AA_JITTER; /* emboss */
- if (tria) {
- vcount += (tria_vcount[tria] + 2) * WIDGET_AA_JITTER; /* tria1 */
- if (!ELEM(tria, ROUNDBOX_TRIA_CHECK, ROUNDBOX_TRIA_HOLD_ACTION_ARROW, ROUNDBOX_TRIA_MENU)) {
- vcount += (tria_vcount[tria] + 2) * WIDGET_AA_JITTER; /* tria2 */
- }
- }
- GPU_vertbuf_data_alloc(vbo, vcount);
- GPU_vertbuf_attr_get_raw_data(vbo, g_ui_batch_cache.vflag_id, &vflag_step);
- /* Inner */
- for (int c1 = 0, c2 = 3; c1 < 2; c1++, c2--) {
- for (int a1 = 0, a2 = WIDGET_CURVE_RESOLU -1; a2 >= 0; a1++, a2--) {
- last_data = set_roundbox_vertex(&vflag_step, c1, a1, NO_AA, true, false, INNER);
- last_data = set_roundbox_vertex(&vflag_step, c2, a2, NO_AA, true, false, INNER);
- }
- }
- /* restart */
- set_roundbox_vertex_data(&vflag_step, last_data);
- set_roundbox_vertex(&vflag_step, 0, 0, 0, true, false, OUTLINE);
- /* Outlines */
- for (int j = 0; j < WIDGET_AA_JITTER; j++) {
- for (int c = 0; c < 4; c++) {
- for (int a = 0; a < WIDGET_CURVE_RESOLU; a++) {
- set_roundbox_vertex(&vflag_step, c, a, j, true, false, OUTLINE);
- set_roundbox_vertex(&vflag_step, c, a, j, false, false, OUTLINE);
- }
- }
- /* Close the loop. */
- set_roundbox_vertex(&vflag_step, 0, 0, j, true, false, OUTLINE);
- last_data = set_roundbox_vertex(&vflag_step, 0, 0, j, false, false, OUTLINE);
- }
- /* restart */
- set_roundbox_vertex_data(&vflag_step, last_data);
- set_roundbox_vertex(&vflag_step, 0, 0, 0, false, false, EMBOSS);
- /* Emboss */
- /* go back and forth : avoid degenerate triangle (but beware of backface cull) */
- bool rev = false;
- for (int j = 0; j < WIDGET_AA_JITTER; j++, rev = !rev) {
- for (int c = (rev) ? 1 : 0; (rev) ? c >= 0 : c < 2; (rev) ? c-- : c++) {
- int sta = (rev) ? WIDGET_CURVE_RESOLU - 1 : 0;
- int end = WIDGET_CURVE_RESOLU;
- for (int a = sta; (rev) ? a >= 0 : a < end; (rev) ? a-- : a++) {
- set_roundbox_vertex(&vflag_step, c, a, j, false, false, EMBOSS);
- last_data = set_roundbox_vertex(&vflag_step, c, a, j, false, true, EMBOSS);
- }
- }
- }
- if (tria) {
- roundbox_batch_add_tria(&vflag_step, tria, last_data);
- }
- g_ui_batch_cache.roundbox_widget[tria] = GPU_batch_create_ex(GPU_PRIM_TRI_STRIP, vbo, NULL, GPU_BATCH_OWNS_VBO);
- gpu_batch_presets_register(g_ui_batch_cache.roundbox_widget[tria]);
- }
- return g_ui_batch_cache.roundbox_widget[tria];
+ if (g_ui_batch_cache.roundbox_widget[tria] == NULL) {
+ uint32_t last_data;
+ GPUVertBufRaw vflag_step;
+ GPUVertBuf *vbo = GPU_vertbuf_create_with_format(vflag_format());
+ int vcount = WIDGET_SIZE_MAX; /* inner */
+ vcount += 2; /* restart */
+ vcount += ((WIDGET_SIZE_MAX + 1) * 2) * WIDGET_AA_JITTER; /* outline (edges) */
+ vcount += 2; /* restart */
+ vcount += ((WIDGET_CURVE_RESOLU * 2) * 2) * WIDGET_AA_JITTER; /* emboss */
+ if (tria) {
+ vcount += (tria_vcount[tria] + 2) * WIDGET_AA_JITTER; /* tria1 */
+ if (!ELEM(tria, ROUNDBOX_TRIA_CHECK, ROUNDBOX_TRIA_HOLD_ACTION_ARROW, ROUNDBOX_TRIA_MENU)) {
+ vcount += (tria_vcount[tria] + 2) * WIDGET_AA_JITTER; /* tria2 */
+ }
+ }
+ GPU_vertbuf_data_alloc(vbo, vcount);
+ GPU_vertbuf_attr_get_raw_data(vbo, g_ui_batch_cache.vflag_id, &vflag_step);
+ /* Inner */
+ for (int c1 = 0, c2 = 3; c1 < 2; c1++, c2--) {
+ for (int a1 = 0, a2 = WIDGET_CURVE_RESOLU - 1; a2 >= 0; a1++, a2--) {
+ last_data = set_roundbox_vertex(&vflag_step, c1, a1, NO_AA, true, false, INNER);
+ last_data = set_roundbox_vertex(&vflag_step, c2, a2, NO_AA, true, false, INNER);
+ }
+ }
+ /* restart */
+ set_roundbox_vertex_data(&vflag_step, last_data);
+ set_roundbox_vertex(&vflag_step, 0, 0, 0, true, false, OUTLINE);
+ /* Outlines */
+ for (int j = 0; j < WIDGET_AA_JITTER; j++) {
+ for (int c = 0; c < 4; c++) {
+ for (int a = 0; a < WIDGET_CURVE_RESOLU; a++) {
+ set_roundbox_vertex(&vflag_step, c, a, j, true, false, OUTLINE);
+ set_roundbox_vertex(&vflag_step, c, a, j, false, false, OUTLINE);
+ }
+ }
+ /* Close the loop. */
+ set_roundbox_vertex(&vflag_step, 0, 0, j, true, false, OUTLINE);
+ last_data = set_roundbox_vertex(&vflag_step, 0, 0, j, false, false, OUTLINE);
+ }
+ /* restart */
+ set_roundbox_vertex_data(&vflag_step, last_data);
+ set_roundbox_vertex(&vflag_step, 0, 0, 0, false, false, EMBOSS);
+ /* Emboss */
+ /* go back and forth : avoid degenerate triangle (but beware of backface cull) */
+ bool rev = false;
+ for (int j = 0; j < WIDGET_AA_JITTER; j++, rev = !rev) {
+ for (int c = (rev) ? 1 : 0; (rev) ? c >= 0 : c < 2; (rev) ? c-- : c++) {
+ int sta = (rev) ? WIDGET_CURVE_RESOLU - 1 : 0;
+ int end = WIDGET_CURVE_RESOLU;
+ for (int a = sta; (rev) ? a >= 0 : a < end; (rev) ? a-- : a++) {
+ set_roundbox_vertex(&vflag_step, c, a, j, false, false, EMBOSS);
+ last_data = set_roundbox_vertex(&vflag_step, c, a, j, false, true, EMBOSS);
+ }
+ }
+ }
+ if (tria) {
+ roundbox_batch_add_tria(&vflag_step, tria, last_data);
+ }
+ g_ui_batch_cache.roundbox_widget[tria] = GPU_batch_create_ex(
+ GPU_PRIM_TRI_STRIP, vbo, NULL, GPU_BATCH_OWNS_VBO);
+ gpu_batch_presets_register(g_ui_batch_cache.roundbox_widget[tria]);
+ }
+ return g_ui_batch_cache.roundbox_widget[tria];
}
GPUBatch *ui_batch_roundbox_get(bool filled, bool antialiased)
{
- GPUBatch **batch = NULL;
-
- if (filled) {
- if (antialiased) {
- batch = &g_ui_batch_cache.roundbox_simple_aa;
- }
- else {
- batch = &g_ui_batch_cache.roundbox_simple;
- }
- }
- else {
- if (antialiased) {
- BLI_assert(0); /* Use GL_LINE_SMOOTH instead!!: */
- }
- else {
- batch = &g_ui_batch_cache.roundbox_simple_outline;
- }
- }
-
- if (*batch == NULL) {
- uint32_t last_data;
- GPUVertBufRaw vflag_step;
- GPUVertBuf *vbo = GPU_vertbuf_create_with_format(vflag_format());
- int vcount = WIDGET_SIZE_MAX;
- vcount += (filled) ? 2 : 0;
- vcount *= (antialiased) ? WIDGET_AA_JITTER : 1;
- GPU_vertbuf_data_alloc(vbo, vcount);
- GPU_vertbuf_attr_get_raw_data(vbo, g_ui_batch_cache.vflag_id, &vflag_step);
-
- if (filled) {
- for (int j = 0; j < WIDGET_AA_JITTER; j++) {
- if (!antialiased) {
- j = NO_AA;
- }
- /* restart */
- set_roundbox_vertex(&vflag_step, 0, 0, j, true, false, INNER);
- for (int c1 = 0, c2 = 3; c1 < 2; c1++, c2--) {
- for (int a1 = 0, a2 = WIDGET_CURVE_RESOLU -1; a2 >= 0; a1++, a2--) {
- last_data = set_roundbox_vertex(&vflag_step, c1, a1, j, true, false, INNER);
- last_data = set_roundbox_vertex(&vflag_step, c2, a2, j, true, false, INNER);
- }
- }
- /* restart */
- set_roundbox_vertex_data(&vflag_step, last_data);
- if (!antialiased) {
- break;
- }
- }
- *batch = GPU_batch_create_ex(GPU_PRIM_TRI_STRIP, vbo, NULL, GPU_BATCH_OWNS_VBO);
- }
- else {
- for (int j = 0; j < WIDGET_AA_JITTER; j++) {
- if (!antialiased) {
- j = NO_AA;
- }
- for (int c = 0; c < 4; c++) {
- for (int a = 0; a < WIDGET_CURVE_RESOLU; a++) {
- set_roundbox_vertex(&vflag_step, c, a, j, true, false, INNER);
- }
- }
- if (!antialiased) {
- break;
- }
- }
- *batch = GPU_batch_create_ex(GPU_PRIM_LINE_LOOP, vbo, NULL, GPU_BATCH_OWNS_VBO);
- }
-
- gpu_batch_presets_register(*batch);
- }
- return *batch;
+ GPUBatch **batch = NULL;
+
+ if (filled) {
+ if (antialiased) {
+ batch = &g_ui_batch_cache.roundbox_simple_aa;
+ }
+ else {
+ batch = &g_ui_batch_cache.roundbox_simple;
+ }
+ }
+ else {
+ if (antialiased) {
+ BLI_assert(0); /* Use GL_LINE_SMOOTH instead!!: */
+ }
+ else {
+ batch = &g_ui_batch_cache.roundbox_simple_outline;
+ }
+ }
+
+ if (*batch == NULL) {
+ uint32_t last_data;
+ GPUVertBufRaw vflag_step;
+ GPUVertBuf *vbo = GPU_vertbuf_create_with_format(vflag_format());
+ int vcount = WIDGET_SIZE_MAX;
+ vcount += (filled) ? 2 : 0;
+ vcount *= (antialiased) ? WIDGET_AA_JITTER : 1;
+ GPU_vertbuf_data_alloc(vbo, vcount);
+ GPU_vertbuf_attr_get_raw_data(vbo, g_ui_batch_cache.vflag_id, &vflag_step);
+
+ if (filled) {
+ for (int j = 0; j < WIDGET_AA_JITTER; j++) {
+ if (!antialiased) {
+ j = NO_AA;
+ }
+ /* restart */
+ set_roundbox_vertex(&vflag_step, 0, 0, j, true, false, INNER);
+ for (int c1 = 0, c2 = 3; c1 < 2; c1++, c2--) {
+ for (int a1 = 0, a2 = WIDGET_CURVE_RESOLU - 1; a2 >= 0; a1++, a2--) {
+ last_data = set_roundbox_vertex(&vflag_step, c1, a1, j, true, false, INNER);
+ last_data = set_roundbox_vertex(&vflag_step, c2, a2, j, true, false, INNER);
+ }
+ }
+ /* restart */
+ set_roundbox_vertex_data(&vflag_step, last_data);
+ if (!antialiased) {
+ break;
+ }
+ }
+ *batch = GPU_batch_create_ex(GPU_PRIM_TRI_STRIP, vbo, NULL, GPU_BATCH_OWNS_VBO);
+ }
+ else {
+ for (int j = 0; j < WIDGET_AA_JITTER; j++) {
+ if (!antialiased) {
+ j = NO_AA;
+ }
+ for (int c = 0; c < 4; c++) {
+ for (int a = 0; a < WIDGET_CURVE_RESOLU; a++) {
+ set_roundbox_vertex(&vflag_step, c, a, j, true, false, INNER);
+ }
+ }
+ if (!antialiased) {
+ break;
+ }
+ }
+ *batch = GPU_batch_create_ex(GPU_PRIM_LINE_LOOP, vbo, NULL, GPU_BATCH_OWNS_VBO);
+ }
+
+ gpu_batch_presets_register(*batch);
+ }
+ return *batch;
}
GPUBatch *ui_batch_roundbox_shadow_get(void)
{
- if (g_ui_batch_cache.roundbox_shadow == NULL) {
- uint32_t last_data;
- GPUVertBufRaw vflag_step;
- GPUVertBuf *vbo = GPU_vertbuf_create_with_format(vflag_format());
- int vcount = (WIDGET_SIZE_MAX + 1) * 2 + 2 + WIDGET_SIZE_MAX;
- GPU_vertbuf_data_alloc(vbo, vcount);
- GPU_vertbuf_attr_get_raw_data(vbo, g_ui_batch_cache.vflag_id, &vflag_step);
-
- for (int c = 0; c < 4; c++) {
- for (int a = 0; a < WIDGET_CURVE_RESOLU; a++) {
- set_roundbox_vertex(&vflag_step, c, a, NO_AA, true, false, INNER);
- set_roundbox_vertex(&vflag_step, c, a, NO_AA, false, false, INNER);
- }
- }
- /* close loop */
- last_data = set_roundbox_vertex(&vflag_step, 0, 0, NO_AA, true, false, INNER);
- last_data = set_roundbox_vertex(&vflag_step, 0, 0, NO_AA, false, false, INNER);
- /* restart */
- set_roundbox_vertex_data(&vflag_step, last_data);
- set_roundbox_vertex(&vflag_step, 0, 0, NO_AA, true, false, INNER);
- /* filled */
- for (int c1 = 0, c2 = 3; c1 < 2; c1++, c2--) {
- for (int a1 = 0, a2 = WIDGET_CURVE_RESOLU -1; a2 >= 0; a1++, a2--) {
- set_roundbox_vertex(&vflag_step, c1, a1, NO_AA, true, false, INNER);
- set_roundbox_vertex(&vflag_step, c2, a2, NO_AA, true, false, INNER);
- }
- }
- g_ui_batch_cache.roundbox_shadow = GPU_batch_create_ex(GPU_PRIM_TRI_STRIP, vbo, NULL, GPU_BATCH_OWNS_VBO);
- gpu_batch_presets_register(g_ui_batch_cache.roundbox_shadow);
- }
- return g_ui_batch_cache.roundbox_shadow;
+ if (g_ui_batch_cache.roundbox_shadow == NULL) {
+ uint32_t last_data;
+ GPUVertBufRaw vflag_step;
+ GPUVertBuf *vbo = GPU_vertbuf_create_with_format(vflag_format());
+ int vcount = (WIDGET_SIZE_MAX + 1) * 2 + 2 + WIDGET_SIZE_MAX;
+ GPU_vertbuf_data_alloc(vbo, vcount);
+ GPU_vertbuf_attr_get_raw_data(vbo, g_ui_batch_cache.vflag_id, &vflag_step);
+
+ for (int c = 0; c < 4; c++) {
+ for (int a = 0; a < WIDGET_CURVE_RESOLU; a++) {
+ set_roundbox_vertex(&vflag_step, c, a, NO_AA, true, false, INNER);
+ set_roundbox_vertex(&vflag_step, c, a, NO_AA, false, false, INNER);
+ }
+ }
+ /* close loop */
+ last_data = set_roundbox_vertex(&vflag_step, 0, 0, NO_AA, true, false, INNER);
+ last_data = set_roundbox_vertex(&vflag_step, 0, 0, NO_AA, false, false, INNER);
+ /* restart */
+ set_roundbox_vertex_data(&vflag_step, last_data);
+ set_roundbox_vertex(&vflag_step, 0, 0, NO_AA, true, false, INNER);
+ /* filled */
+ for (int c1 = 0, c2 = 3; c1 < 2; c1++, c2--) {
+ for (int a1 = 0, a2 = WIDGET_CURVE_RESOLU - 1; a2 >= 0; a1++, a2--) {
+ set_roundbox_vertex(&vflag_step, c1, a1, NO_AA, true, false, INNER);
+ set_roundbox_vertex(&vflag_step, c2, a2, NO_AA, true, false, INNER);
+ }
+ }
+ g_ui_batch_cache.roundbox_shadow = GPU_batch_create_ex(
+ GPU_PRIM_TRI_STRIP, vbo, NULL, GPU_BATCH_OWNS_VBO);
+ gpu_batch_presets_register(g_ui_batch_cache.roundbox_shadow);
+ }
+ return g_ui_batch_cache.roundbox_shadow;
}
#undef INNER
@@ -550,354 +597,360 @@ GPUBatch *ui_batch_roundbox_shadow_get(void)
/* ************************************************* */
-void UI_draw_anti_tria(float x1, float y1, float x2, float y2, float x3, float y3,
- const float color[4])
+void UI_draw_anti_tria(
+ float x1, float y1, float x2, float y2, float x3, float y3, const float color[4])
{
- float tri_arr[3][2] = {{x1, y1}, {x2, y2}, {x3, y3}};
- float draw_color[4];
+ float tri_arr[3][2] = {{x1, y1}, {x2, y2}, {x3, y3}};
+ float draw_color[4];
- copy_v4_v4(draw_color, color);
- /* Note: This won't give back the original color. */
- draw_color[3] *= 1.0f / WIDGET_AA_JITTER;
+ copy_v4_v4(draw_color, color);
+ /* Note: This won't give back the original color. */
+ draw_color[3] *= 1.0f / WIDGET_AA_JITTER;
- GPU_blend(true);
+ GPU_blend(true);
- uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
- immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+ uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
- immUniformColor4fv(draw_color);
- immBegin(GPU_PRIM_TRIS, 3 * WIDGET_AA_JITTER);
+ immUniformColor4fv(draw_color);
+ immBegin(GPU_PRIM_TRIS, 3 * WIDGET_AA_JITTER);
- /* for each AA step */
- for (int j = 0; j < WIDGET_AA_JITTER; j++) {
- immVertex2f(pos, tri_arr[0][0] + jit[j][0], tri_arr[0][1] + jit[j][1]);
- immVertex2f(pos, tri_arr[1][0] + jit[j][0], tri_arr[1][1] + jit[j][1]);
- immVertex2f(pos, tri_arr[2][0] + jit[j][0], tri_arr[2][1] + jit[j][1]);
- }
+ /* for each AA step */
+ for (int j = 0; j < WIDGET_AA_JITTER; j++) {
+ immVertex2f(pos, tri_arr[0][0] + jit[j][0], tri_arr[0][1] + jit[j][1]);
+ immVertex2f(pos, tri_arr[1][0] + jit[j][0], tri_arr[1][1] + jit[j][1]);
+ immVertex2f(pos, tri_arr[2][0] + jit[j][0], tri_arr[2][1] + jit[j][1]);
+ }
- immEnd();
+ immEnd();
- immUnbindProgram();
+ immUnbindProgram();
- GPU_blend(false);
+ GPU_blend(false);
}
/* triangle 'icon' inside rect */
void ui_draw_anti_tria_rect(const rctf *rect, char dir, const float color[4])
{
- if (dir == 'h') {
- float half = 0.5f * BLI_rctf_size_y(rect);
- UI_draw_anti_tria(rect->xmin, rect->ymin, rect->xmin, rect->ymax, rect->xmax, rect->ymin + half, color);
- }
- else {
- float half = 0.5f * BLI_rctf_size_x(rect);
- UI_draw_anti_tria(rect->xmin, rect->ymax, rect->xmax, rect->ymax, rect->xmin + half, rect->ymin, color);
- }
+ if (dir == 'h') {
+ float half = 0.5f * BLI_rctf_size_y(rect);
+ UI_draw_anti_tria(
+ rect->xmin, rect->ymin, rect->xmin, rect->ymax, rect->xmax, rect->ymin + half, color);
+ }
+ else {
+ float half = 0.5f * BLI_rctf_size_x(rect);
+ UI_draw_anti_tria(
+ rect->xmin, rect->ymax, rect->xmax, rect->ymax, rect->xmin + half, rect->ymin, color);
+ }
}
-
void UI_draw_anti_fan(float tri_array[][2], uint length, const float color[4])
{
- float draw_color[4];
+ float draw_color[4];
- copy_v4_v4(draw_color, color);
- draw_color[3] *= 2.0f / WIDGET_AA_JITTER;
+ copy_v4_v4(draw_color, color);
+ draw_color[3] *= 2.0f / WIDGET_AA_JITTER;
- GPU_blend(true);
+ GPU_blend(true);
- uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
- immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+ uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
- immUniformColor4fv(draw_color);
+ immUniformColor4fv(draw_color);
- /* for each AA step */
- for (int j = 0; j < WIDGET_AA_JITTER; j++) {
- immBegin(GPU_PRIM_TRI_FAN, length);
- immVertex2f(pos, tri_array[0][0], tri_array[0][1]);
- immVertex2f(pos, tri_array[1][0], tri_array[1][1]);
+ /* for each AA step */
+ for (int j = 0; j < WIDGET_AA_JITTER; j++) {
+ immBegin(GPU_PRIM_TRI_FAN, length);
+ immVertex2f(pos, tri_array[0][0], tri_array[0][1]);
+ immVertex2f(pos, tri_array[1][0], tri_array[1][1]);
- /* We jitter only the middle of the fan, the extremes are pinned. */
- for (int i = 2; i < length - 1; i++) {
- immVertex2f(pos, tri_array[i][0] + jit[j][0], tri_array[i][1] + jit[j][1]);
- }
+ /* We jitter only the middle of the fan, the extremes are pinned. */
+ for (int i = 2; i < length - 1; i++) {
+ immVertex2f(pos, tri_array[i][0] + jit[j][0], tri_array[i][1] + jit[j][1]);
+ }
- immVertex2f(pos, tri_array[length - 1][0], tri_array[length - 1][1]);
- immEnd();
- }
+ immVertex2f(pos, tri_array[length - 1][0], tri_array[length - 1][1]);
+ immEnd();
+ }
- immUnbindProgram();
+ immUnbindProgram();
- GPU_blend(false);
+ GPU_blend(false);
}
static void widget_init(uiWidgetBase *wtb)
{
- wtb->totvert = wtb->halfwayvert = 0;
- wtb->tria1.tot = 0;
- wtb->tria2.tot = 0;
- wtb->tria1.type = ROUNDBOX_TRIA_NONE;
- wtb->tria1.size = 0;
- wtb->tria2.size = 0;
-
- wtb->draw_inner = true;
- wtb->draw_outline = true;
- wtb->draw_emboss = true;
-
- wtb->uniform_params.shade_dir = 1.0f;
- wtb->uniform_params.alpha_discard = 1.0f;
+ wtb->totvert = wtb->halfwayvert = 0;
+ wtb->tria1.tot = 0;
+ wtb->tria2.tot = 0;
+ wtb->tria1.type = ROUNDBOX_TRIA_NONE;
+ wtb->tria1.size = 0;
+ wtb->tria2.size = 0;
+
+ wtb->draw_inner = true;
+ wtb->draw_outline = true;
+ wtb->draw_emboss = true;
+
+ wtb->uniform_params.shade_dir = 1.0f;
+ wtb->uniform_params.alpha_discard = 1.0f;
}
/* helper call, makes shadow rect, with 'sun' above menu, so only shadow to left/right/bottom */
/* return tot */
-static int round_box_shadow_edges(float (*vert)[2], const rcti *rect, float rad, int roundboxalign, float step)
+static int round_box_shadow_edges(
+ float (*vert)[2], const rcti *rect, float rad, int roundboxalign, float step)
{
- float vec[WIDGET_CURVE_RESOLU][2];
- float minx, miny, maxx, maxy;
- int a, tot = 0;
-
- rad += step;
-
- if (2.0f * rad > BLI_rcti_size_y(rect)) {
- rad = 0.5f * BLI_rcti_size_y(rect);
- }
-
- minx = rect->xmin - step;
- miny = rect->ymin - step;
- maxx = rect->xmax + step;
- maxy = rect->ymax + step;
-
- /* mult */
- for (a = 0; a < WIDGET_CURVE_RESOLU; a++) {
- vec[a][0] = rad * cornervec[a][0];
- vec[a][1] = rad * cornervec[a][1];
- }
-
- /* start with left-top, anti clockwise */
- if (roundboxalign & UI_CNR_TOP_LEFT) {
- for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
- vert[tot][0] = minx + rad - vec[a][0];
- vert[tot][1] = maxy - vec[a][1];
- }
- }
- else {
- for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
- vert[tot][0] = minx;
- vert[tot][1] = maxy;
- }
- }
-
- if (roundboxalign & UI_CNR_BOTTOM_LEFT) {
- for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
- vert[tot][0] = minx + vec[a][1];
- vert[tot][1] = miny + rad - vec[a][0];
- }
- }
- else {
- for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
- vert[tot][0] = minx;
- vert[tot][1] = miny;
- }
- }
-
- if (roundboxalign & UI_CNR_BOTTOM_RIGHT) {
- for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
- vert[tot][0] = maxx - rad + vec[a][0];
- vert[tot][1] = miny + vec[a][1];
- }
- }
- else {
- for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
- vert[tot][0] = maxx;
- vert[tot][1] = miny;
- }
- }
-
- if (roundboxalign & UI_CNR_TOP_RIGHT) {
- for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
- vert[tot][0] = maxx - vec[a][1];
- vert[tot][1] = maxy - rad + vec[a][0];
- }
- }
- else {
- for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
- vert[tot][0] = maxx;
- vert[tot][1] = maxy;
- }
- }
- return tot;
+ float vec[WIDGET_CURVE_RESOLU][2];
+ float minx, miny, maxx, maxy;
+ int a, tot = 0;
+
+ rad += step;
+
+ if (2.0f * rad > BLI_rcti_size_y(rect)) {
+ rad = 0.5f * BLI_rcti_size_y(rect);
+ }
+
+ minx = rect->xmin - step;
+ miny = rect->ymin - step;
+ maxx = rect->xmax + step;
+ maxy = rect->ymax + step;
+
+ /* mult */
+ for (a = 0; a < WIDGET_CURVE_RESOLU; a++) {
+ vec[a][0] = rad * cornervec[a][0];
+ vec[a][1] = rad * cornervec[a][1];
+ }
+
+ /* start with left-top, anti clockwise */
+ if (roundboxalign & UI_CNR_TOP_LEFT) {
+ for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
+ vert[tot][0] = minx + rad - vec[a][0];
+ vert[tot][1] = maxy - vec[a][1];
+ }
+ }
+ else {
+ for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
+ vert[tot][0] = minx;
+ vert[tot][1] = maxy;
+ }
+ }
+
+ if (roundboxalign & UI_CNR_BOTTOM_LEFT) {
+ for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
+ vert[tot][0] = minx + vec[a][1];
+ vert[tot][1] = miny + rad - vec[a][0];
+ }
+ }
+ else {
+ for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
+ vert[tot][0] = minx;
+ vert[tot][1] = miny;
+ }
+ }
+
+ if (roundboxalign & UI_CNR_BOTTOM_RIGHT) {
+ for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
+ vert[tot][0] = maxx - rad + vec[a][0];
+ vert[tot][1] = miny + vec[a][1];
+ }
+ }
+ else {
+ for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
+ vert[tot][0] = maxx;
+ vert[tot][1] = miny;
+ }
+ }
+
+ if (roundboxalign & UI_CNR_TOP_RIGHT) {
+ for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
+ vert[tot][0] = maxx - vec[a][1];
+ vert[tot][1] = maxy - rad + vec[a][0];
+ }
+ }
+ else {
+ for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
+ vert[tot][0] = maxx;
+ vert[tot][1] = maxy;
+ }
+ }
+ return tot;
}
/* this call has 1 extra arg to allow mask outline */
-static void round_box__edges(uiWidgetBase *wt, int roundboxalign, const rcti *rect, float rad, float radi)
+static void round_box__edges(
+ uiWidgetBase *wt, int roundboxalign, const rcti *rect, float rad, float radi)
{
- float vec[WIDGET_CURVE_RESOLU][2], veci[WIDGET_CURVE_RESOLU][2];
- float minx = rect->xmin, miny = rect->ymin, maxx = rect->xmax, maxy = rect->ymax;
- float minxi = minx + U.pixelsize; /* boundbox inner */
- float maxxi = maxx - U.pixelsize;
- float minyi = miny + U.pixelsize;
- float maxyi = maxy - U.pixelsize;
- /* for uv, can divide by zero */
- float facxi = (maxxi != minxi) ? 1.0f / (maxxi - minxi) : 0.0f;
- float facyi = (maxyi != minyi) ? 1.0f / (maxyi - minyi) : 0.0f;
- int a, tot = 0, minsize;
- const int hnum = (
- (roundboxalign & (UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT)) == (UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT) ||
- (roundboxalign & (UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT)) == (UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT)) ? 1 : 2;
- const int vnum = (
- (roundboxalign & (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT)) == (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT) ||
- (roundboxalign & (UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT)) == (UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT)) ? 1 : 2;
-
- minsize = min_ii(
- BLI_rcti_size_x(rect) * hnum,
- BLI_rcti_size_y(rect) * vnum);
-
- if (2.0f * rad > minsize) {
- rad = 0.5f * minsize;
- }
-
- if (2.0f * (radi + 1.0f) > minsize) {
- radi = 0.5f * minsize - U.pixelsize;
- }
-
- wt->uniform_params.rad = rad;
- wt->uniform_params.radi = radi;
- wt->uniform_params.facxi = facxi;
- wt->uniform_params.facyi = facyi;
- wt->uniform_params.round_corners[0] = (roundboxalign & UI_CNR_BOTTOM_LEFT) ? 1.0f : 0.0f;
- wt->uniform_params.round_corners[1] = (roundboxalign & UI_CNR_BOTTOM_RIGHT) ? 1.0f : 0.0f;
- wt->uniform_params.round_corners[2] = (roundboxalign & UI_CNR_TOP_RIGHT) ? 1.0f : 0.0f;
- wt->uniform_params.round_corners[3] = (roundboxalign & UI_CNR_TOP_LEFT) ? 1.0f : 0.0f;
- BLI_rctf_rcti_copy(&wt->uniform_params.rect, rect);
- BLI_rctf_init(&wt->uniform_params.recti, minxi, maxxi, minyi, maxyi);
-
- /* mult */
- for (a = 0; a < WIDGET_CURVE_RESOLU; a++) {
- veci[a][0] = radi * cornervec[a][0];
- veci[a][1] = radi * cornervec[a][1];
- vec[a][0] = rad * cornervec[a][0];
- vec[a][1] = rad * cornervec[a][1];
- }
-
- /* corner left-bottom */
- if (roundboxalign & UI_CNR_BOTTOM_LEFT) {
-
- for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
- wt->inner_v[tot][0] = minxi + veci[a][1];
- wt->inner_v[tot][1] = minyi + radi - veci[a][0];
-
- wt->outer_v[tot][0] = minx + vec[a][1];
- wt->outer_v[tot][1] = miny + rad - vec[a][0];
-
- wt->inner_uv[tot][0] = facxi * (wt->inner_v[tot][0] - minxi);
- wt->inner_uv[tot][1] = facyi * (wt->inner_v[tot][1] - minyi);
- }
- }
- else {
- wt->inner_v[tot][0] = minxi;
- wt->inner_v[tot][1] = minyi;
-
- wt->outer_v[tot][0] = minx;
- wt->outer_v[tot][1] = miny;
-
- wt->inner_uv[tot][0] = 0.0f;
- wt->inner_uv[tot][1] = 0.0f;
-
- tot++;
- }
-
- /* corner right-bottom */
- if (roundboxalign & UI_CNR_BOTTOM_RIGHT) {
-
- for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
- wt->inner_v[tot][0] = maxxi - radi + veci[a][0];
- wt->inner_v[tot][1] = minyi + veci[a][1];
-
- wt->outer_v[tot][0] = maxx - rad + vec[a][0];
- wt->outer_v[tot][1] = miny + vec[a][1];
-
- wt->inner_uv[tot][0] = facxi * (wt->inner_v[tot][0] - minxi);
- wt->inner_uv[tot][1] = facyi * (wt->inner_v[tot][1] - minyi);
- }
- }
- else {
- wt->inner_v[tot][0] = maxxi;
- wt->inner_v[tot][1] = minyi;
-
- wt->outer_v[tot][0] = maxx;
- wt->outer_v[tot][1] = miny;
-
- wt->inner_uv[tot][0] = 1.0f;
- wt->inner_uv[tot][1] = 0.0f;
-
- tot++;
- }
-
- wt->halfwayvert = tot;
-
- /* corner right-top */
- if (roundboxalign & UI_CNR_TOP_RIGHT) {
-
- for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
- wt->inner_v[tot][0] = maxxi - veci[a][1];
- wt->inner_v[tot][1] = maxyi - radi + veci[a][0];
-
- wt->outer_v[tot][0] = maxx - vec[a][1];
- wt->outer_v[tot][1] = maxy - rad + vec[a][0];
+ float vec[WIDGET_CURVE_RESOLU][2], veci[WIDGET_CURVE_RESOLU][2];
+ float minx = rect->xmin, miny = rect->ymin, maxx = rect->xmax, maxy = rect->ymax;
+ float minxi = minx + U.pixelsize; /* boundbox inner */
+ float maxxi = maxx - U.pixelsize;
+ float minyi = miny + U.pixelsize;
+ float maxyi = maxy - U.pixelsize;
+ /* for uv, can divide by zero */
+ float facxi = (maxxi != minxi) ? 1.0f / (maxxi - minxi) : 0.0f;
+ float facyi = (maxyi != minyi) ? 1.0f / (maxyi - minyi) : 0.0f;
+ int a, tot = 0, minsize;
+ const int hnum = ((roundboxalign & (UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT)) ==
+ (UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT) ||
+ (roundboxalign & (UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT)) ==
+ (UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT)) ?
+ 1 :
+ 2;
+ const int vnum = ((roundboxalign & (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT)) ==
+ (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT) ||
+ (roundboxalign & (UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT)) ==
+ (UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT)) ?
+ 1 :
+ 2;
+
+ minsize = min_ii(BLI_rcti_size_x(rect) * hnum, BLI_rcti_size_y(rect) * vnum);
+
+ if (2.0f * rad > minsize) {
+ rad = 0.5f * minsize;
+ }
+
+ if (2.0f * (radi + 1.0f) > minsize) {
+ radi = 0.5f * minsize - U.pixelsize;
+ }
+
+ wt->uniform_params.rad = rad;
+ wt->uniform_params.radi = radi;
+ wt->uniform_params.facxi = facxi;
+ wt->uniform_params.facyi = facyi;
+ wt->uniform_params.round_corners[0] = (roundboxalign & UI_CNR_BOTTOM_LEFT) ? 1.0f : 0.0f;
+ wt->uniform_params.round_corners[1] = (roundboxalign & UI_CNR_BOTTOM_RIGHT) ? 1.0f : 0.0f;
+ wt->uniform_params.round_corners[2] = (roundboxalign & UI_CNR_TOP_RIGHT) ? 1.0f : 0.0f;
+ wt->uniform_params.round_corners[3] = (roundboxalign & UI_CNR_TOP_LEFT) ? 1.0f : 0.0f;
+ BLI_rctf_rcti_copy(&wt->uniform_params.rect, rect);
+ BLI_rctf_init(&wt->uniform_params.recti, minxi, maxxi, minyi, maxyi);
+
+ /* mult */
+ for (a = 0; a < WIDGET_CURVE_RESOLU; a++) {
+ veci[a][0] = radi * cornervec[a][0];
+ veci[a][1] = radi * cornervec[a][1];
+ vec[a][0] = rad * cornervec[a][0];
+ vec[a][1] = rad * cornervec[a][1];
+ }
+
+ /* corner left-bottom */
+ if (roundboxalign & UI_CNR_BOTTOM_LEFT) {
+
+ for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
+ wt->inner_v[tot][0] = minxi + veci[a][1];
+ wt->inner_v[tot][1] = minyi + radi - veci[a][0];
+
+ wt->outer_v[tot][0] = minx + vec[a][1];
+ wt->outer_v[tot][1] = miny + rad - vec[a][0];
+
+ wt->inner_uv[tot][0] = facxi * (wt->inner_v[tot][0] - minxi);
+ wt->inner_uv[tot][1] = facyi * (wt->inner_v[tot][1] - minyi);
+ }
+ }
+ else {
+ wt->inner_v[tot][0] = minxi;
+ wt->inner_v[tot][1] = minyi;
+
+ wt->outer_v[tot][0] = minx;
+ wt->outer_v[tot][1] = miny;
+
+ wt->inner_uv[tot][0] = 0.0f;
+ wt->inner_uv[tot][1] = 0.0f;
+
+ tot++;
+ }
+
+ /* corner right-bottom */
+ if (roundboxalign & UI_CNR_BOTTOM_RIGHT) {
+
+ for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
+ wt->inner_v[tot][0] = maxxi - radi + veci[a][0];
+ wt->inner_v[tot][1] = minyi + veci[a][1];
+
+ wt->outer_v[tot][0] = maxx - rad + vec[a][0];
+ wt->outer_v[tot][1] = miny + vec[a][1];
+
+ wt->inner_uv[tot][0] = facxi * (wt->inner_v[tot][0] - minxi);
+ wt->inner_uv[tot][1] = facyi * (wt->inner_v[tot][1] - minyi);
+ }
+ }
+ else {
+ wt->inner_v[tot][0] = maxxi;
+ wt->inner_v[tot][1] = minyi;
+
+ wt->outer_v[tot][0] = maxx;
+ wt->outer_v[tot][1] = miny;
+
+ wt->inner_uv[tot][0] = 1.0f;
+ wt->inner_uv[tot][1] = 0.0f;
+
+ tot++;
+ }
+
+ wt->halfwayvert = tot;
+
+ /* corner right-top */
+ if (roundboxalign & UI_CNR_TOP_RIGHT) {
+
+ for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
+ wt->inner_v[tot][0] = maxxi - veci[a][1];
+ wt->inner_v[tot][1] = maxyi - radi + veci[a][0];
+
+ wt->outer_v[tot][0] = maxx - vec[a][1];
+ wt->outer_v[tot][1] = maxy - rad + vec[a][0];
- wt->inner_uv[tot][0] = facxi * (wt->inner_v[tot][0] - minxi);
- wt->inner_uv[tot][1] = facyi * (wt->inner_v[tot][1] - minyi);
- }
- }
- else {
- wt->inner_v[tot][0] = maxxi;
- wt->inner_v[tot][1] = maxyi;
+ wt->inner_uv[tot][0] = facxi * (wt->inner_v[tot][0] - minxi);
+ wt->inner_uv[tot][1] = facyi * (wt->inner_v[tot][1] - minyi);
+ }
+ }
+ else {
+ wt->inner_v[tot][0] = maxxi;
+ wt->inner_v[tot][1] = maxyi;
- wt->outer_v[tot][0] = maxx;
- wt->outer_v[tot][1] = maxy;
+ wt->outer_v[tot][0] = maxx;
+ wt->outer_v[tot][1] = maxy;
- wt->inner_uv[tot][0] = 1.0f;
- wt->inner_uv[tot][1] = 1.0f;
+ wt->inner_uv[tot][0] = 1.0f;
+ wt->inner_uv[tot][1] = 1.0f;
- tot++;
- }
+ tot++;
+ }
- /* corner left-top */
- if (roundboxalign & UI_CNR_TOP_LEFT) {
+ /* corner left-top */
+ if (roundboxalign & UI_CNR_TOP_LEFT) {
- for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
- wt->inner_v[tot][0] = minxi + radi - veci[a][0];
- wt->inner_v[tot][1] = maxyi - veci[a][1];
+ for (a = 0; a < WIDGET_CURVE_RESOLU; a++, tot++) {
+ wt->inner_v[tot][0] = minxi + radi - veci[a][0];
+ wt->inner_v[tot][1] = maxyi - veci[a][1];
- wt->outer_v[tot][0] = minx + rad - vec[a][0];
- wt->outer_v[tot][1] = maxy - vec[a][1];
+ wt->outer_v[tot][0] = minx + rad - vec[a][0];
+ wt->outer_v[tot][1] = maxy - vec[a][1];
- wt->inner_uv[tot][0] = facxi * (wt->inner_v[tot][0] - minxi);
- wt->inner_uv[tot][1] = facyi * (wt->inner_v[tot][1] - minyi);
- }
+ wt->inner_uv[tot][0] = facxi * (wt->inner_v[tot][0] - minxi);
+ wt->inner_uv[tot][1] = facyi * (wt->inner_v[tot][1] - minyi);
+ }
+ }
+ else {
- }
- else {
+ wt->inner_v[tot][0] = minxi;
+ wt->inner_v[tot][1] = maxyi;
- wt->inner_v[tot][0] = minxi;
- wt->inner_v[tot][1] = maxyi;
+ wt->outer_v[tot][0] = minx;
+ wt->outer_v[tot][1] = maxy;
- wt->outer_v[tot][0] = minx;
- wt->outer_v[tot][1] = maxy;
+ wt->inner_uv[tot][0] = 0.0f;
+ wt->inner_uv[tot][1] = 1.0f;
- wt->inner_uv[tot][0] = 0.0f;
- wt->inner_uv[tot][1] = 1.0f;
+ tot++;
+ }
- tot++;
- }
+ BLI_assert(tot <= WIDGET_SIZE_MAX);
- BLI_assert(tot <= WIDGET_SIZE_MAX);
-
- wt->totvert = tot;
+ wt->totvert = tot;
}
static void round_box_edges(uiWidgetBase *wt, int roundboxalign, const rcti *rect, float rad)
{
- round_box__edges(wt, roundboxalign, rect, rad, rad - U.pixelsize);
+ round_box__edges(wt, roundboxalign, rect, rad, rad - U.pixelsize);
}
/* -------------------------------------------------------------------- */
@@ -905,239 +958,270 @@ static void round_box_edges(uiWidgetBase *wt, int roundboxalign, const rcti *rec
* \{ */
/* based on button rect, return scaled array of triangles */
-static void shape_preset_init_trias_ex(
- uiWidgetTrias *tria, const rcti *rect, float triasize, char where,
- /* input data */
- const float verts[][2], const int verts_tot,
- const uint tris[][3], const int tris_tot)
+static void shape_preset_init_trias_ex(uiWidgetTrias *tria,
+ const rcti *rect,
+ float triasize,
+ char where,
+ /* input data */
+ const float verts[][2],
+ const int verts_tot,
+ const uint tris[][3],
+ const int tris_tot)
{
- float centx, centy, sizex, sizey, minsize;
- int a, i1 = 0, i2 = 1;
-
- if (where == 'r' || where == 'l') {
- minsize = BLI_rcti_size_y(rect);
- }
- else {
- minsize = BLI_rcti_size_x(rect);
- }
-
- /* center position and size */
- centx = (float)rect->xmin + 0.4f * minsize;
- centy = (float)rect->ymin + 0.5f * minsize;
- tria->size = sizex = sizey = -0.5f * triasize * minsize;
-
- if (where == 'r') {
- centx = (float)rect->xmax - 0.4f * minsize;
- sizex = -sizex;
- }
- else if (where == 't') {
- centx = (float)rect->xmin + 0.5f * minsize;
- centy = (float)rect->ymax - 0.5f * minsize;
- sizey = -sizey;
- i2 = 0; i1 = 1;
- }
- else if (where == 'b') {
- centx = (float)rect->xmin + 0.5f * minsize;
- sizex = -sizex;
- i2 = 0; i1 = 1;
- }
-
- for (a = 0; a < verts_tot; a++) {
- tria->vec[a][0] = sizex * verts[a][i1] + centx;
- tria->vec[a][1] = sizey * verts[a][i2] + centy;
- }
-
- tria->center[0] = centx;
- tria->center[1] = centy;
-
- tria->tot = tris_tot;
- tria->index = tris;
+ float centx, centy, sizex, sizey, minsize;
+ int a, i1 = 0, i2 = 1;
+
+ if (where == 'r' || where == 'l') {
+ minsize = BLI_rcti_size_y(rect);
+ }
+ else {
+ minsize = BLI_rcti_size_x(rect);
+ }
+
+ /* center position and size */
+ centx = (float)rect->xmin + 0.4f * minsize;
+ centy = (float)rect->ymin + 0.5f * minsize;
+ tria->size = sizex = sizey = -0.5f * triasize * minsize;
+
+ if (where == 'r') {
+ centx = (float)rect->xmax - 0.4f * minsize;
+ sizex = -sizex;
+ }
+ else if (where == 't') {
+ centx = (float)rect->xmin + 0.5f * minsize;
+ centy = (float)rect->ymax - 0.5f * minsize;
+ sizey = -sizey;
+ i2 = 0;
+ i1 = 1;
+ }
+ else if (where == 'b') {
+ centx = (float)rect->xmin + 0.5f * minsize;
+ sizex = -sizex;
+ i2 = 0;
+ i1 = 1;
+ }
+
+ for (a = 0; a < verts_tot; a++) {
+ tria->vec[a][0] = sizex * verts[a][i1] + centx;
+ tria->vec[a][1] = sizey * verts[a][i2] + centy;
+ }
+
+ tria->center[0] = centx;
+ tria->center[1] = centy;
+
+ tria->tot = tris_tot;
+ tria->index = tris;
}
-static void shape_preset_init_number_arrows(uiWidgetTrias *tria, const rcti *rect, float triasize, char where)
+static void shape_preset_init_number_arrows(uiWidgetTrias *tria,
+ const rcti *rect,
+ float triasize,
+ char where)
{
- tria->type = ROUNDBOX_TRIA_ARROWS;
- shape_preset_init_trias_ex(
- tria, rect, triasize, where,
- g_shape_preset_number_arrow_vert, ARRAY_SIZE(g_shape_preset_number_arrow_vert),
- g_shape_preset_number_arrow_face, ARRAY_SIZE(g_shape_preset_number_arrow_face));
+ tria->type = ROUNDBOX_TRIA_ARROWS;
+ shape_preset_init_trias_ex(tria,
+ rect,
+ triasize,
+ where,
+ g_shape_preset_number_arrow_vert,
+ ARRAY_SIZE(g_shape_preset_number_arrow_vert),
+ g_shape_preset_number_arrow_face,
+ ARRAY_SIZE(g_shape_preset_number_arrow_face));
}
-static void shape_preset_init_hold_action(uiWidgetTrias *tria, const rcti *rect, float triasize, char where)
+static void shape_preset_init_hold_action(uiWidgetTrias *tria,
+ const rcti *rect,
+ float triasize,
+ char where)
{
- tria->type = ROUNDBOX_TRIA_HOLD_ACTION_ARROW;
- /* With the current changes to use batches for widget drawing, the code
- * below is doing almost nothing effectively. 'where' doesn't work either,
- * shader is currently hardcoded to work for the button triangle pointing
- * at the lower right. The same limitation applies to other trias as well.
- * XXX Should be addressed. */
- shape_preset_init_trias_ex(
- tria, rect, triasize, where,
- g_shape_preset_hold_action_vert, ARRAY_SIZE(g_shape_preset_hold_action_vert),
- g_shape_preset_hold_action_face, ARRAY_SIZE(g_shape_preset_hold_action_face));
+ tria->type = ROUNDBOX_TRIA_HOLD_ACTION_ARROW;
+ /* With the current changes to use batches for widget drawing, the code
+ * below is doing almost nothing effectively. 'where' doesn't work either,
+ * shader is currently hardcoded to work for the button triangle pointing
+ * at the lower right. The same limitation applies to other trias as well.
+ * XXX Should be addressed. */
+ shape_preset_init_trias_ex(tria,
+ rect,
+ triasize,
+ where,
+ g_shape_preset_hold_action_vert,
+ ARRAY_SIZE(g_shape_preset_hold_action_vert),
+ g_shape_preset_hold_action_face,
+ ARRAY_SIZE(g_shape_preset_hold_action_face));
}
-static void shape_preset_init_scroll_circle(uiWidgetTrias *tria, const rcti *rect, float triasize, char where)
+static void shape_preset_init_scroll_circle(uiWidgetTrias *tria,
+ const rcti *rect,
+ float triasize,
+ char where)
{
- tria->type = ROUNDBOX_TRIA_SCROLL;
- shape_preset_init_trias_ex(
- tria, rect, triasize, where,
- g_shape_preset_scroll_circle_vert, ARRAY_SIZE(g_shape_preset_scroll_circle_vert),
- g_shape_preset_scroll_circle_face, ARRAY_SIZE(g_shape_preset_scroll_circle_face));
+ tria->type = ROUNDBOX_TRIA_SCROLL;
+ shape_preset_init_trias_ex(tria,
+ rect,
+ triasize,
+ where,
+ g_shape_preset_scroll_circle_vert,
+ ARRAY_SIZE(g_shape_preset_scroll_circle_vert),
+ g_shape_preset_scroll_circle_face,
+ ARRAY_SIZE(g_shape_preset_scroll_circle_face));
}
-static void widget_draw_vertex_buffer(uint pos, uint col, int mode,
+static void widget_draw_vertex_buffer(uint pos,
+ uint col,
+ int mode,
const float quads_pos[WIDGET_SIZE_MAX][2],
const uchar quads_col[WIDGET_SIZE_MAX][4],
uint totvert)
{
- immBegin(mode, totvert);
- for (int i = 0; i < totvert; ++i) {
- if (quads_col) {
- immAttr4ubv(col, quads_col[i]);
- }
- immVertex2fv(pos, quads_pos[i]);
- }
- immEnd();
+ immBegin(mode, totvert);
+ for (int i = 0; i < totvert; ++i) {
+ if (quads_col) {
+ immAttr4ubv(col, quads_col[i]);
+ }
+ immVertex2fv(pos, quads_pos[i]);
+ }
+ immEnd();
}
static void shape_preset_trias_from_rect_menu(uiWidgetTrias *tria, const rcti *rect)
{
- float width = BLI_rcti_size_x(rect);
- float height = BLI_rcti_size_y(rect);
- float centx, centy, size;
+ float width = BLI_rcti_size_x(rect);
+ float height = BLI_rcti_size_y(rect);
+ float centx, centy, size;
- tria->type = ROUNDBOX_TRIA_MENU;
+ tria->type = ROUNDBOX_TRIA_MENU;
- /* Center position and size. */
- tria->center[0] = centx = rect->xmin + 0.52f * BLI_rcti_size_y(rect);
- tria->center[1] = centy = rect->ymin + 0.52f * BLI_rcti_size_y(rect);
- tria->size = size = 0.4f * height;
+ /* Center position and size. */
+ tria->center[0] = centx = rect->xmin + 0.52f * BLI_rcti_size_y(rect);
+ tria->center[1] = centy = rect->ymin + 0.52f * BLI_rcti_size_y(rect);
+ tria->size = size = 0.4f * height;
- if (width > height * 1.1f) {
- /* For wider buttons align tighter to the right. */
- tria->center[0] = centx = rect->xmax - 0.32f * height;
- }
+ if (width > height * 1.1f) {
+ /* For wider buttons align tighter to the right. */
+ tria->center[0] = centx = rect->xmax - 0.32f * height;
+ }
- for (int a = 0; a < 6; a++) {
- tria->vec[a][0] = size * g_shape_preset_menu_arrow_vert[a][0] + centx;
- tria->vec[a][1] = size * g_shape_preset_menu_arrow_vert[a][1] + centy;
- }
+ for (int a = 0; a < 6; a++) {
+ tria->vec[a][0] = size * g_shape_preset_menu_arrow_vert[a][0] + centx;
+ tria->vec[a][1] = size * g_shape_preset_menu_arrow_vert[a][1] + centy;
+ }
- tria->tot = 2;
- tria->index = g_shape_preset_menu_arrow_face;
+ tria->tot = 2;
+ tria->index = g_shape_preset_menu_arrow_face;
}
static void shape_preset_trias_from_rect_checkmark(uiWidgetTrias *tria, const rcti *rect)
{
- float centx, centy, size;
+ float centx, centy, size;
- tria->type = ROUNDBOX_TRIA_CHECK;
+ tria->type = ROUNDBOX_TRIA_CHECK;
- /* Center position and size. */
- tria->center[0] = centx = rect->xmin + 0.5f * BLI_rcti_size_y(rect);
- tria->center[1] = centy = rect->ymin + 0.5f * BLI_rcti_size_y(rect);
- tria->size = size = 0.5f * BLI_rcti_size_y(rect);
+ /* Center position and size. */
+ tria->center[0] = centx = rect->xmin + 0.5f * BLI_rcti_size_y(rect);
+ tria->center[1] = centy = rect->ymin + 0.5f * BLI_rcti_size_y(rect);
+ tria->size = size = 0.5f * BLI_rcti_size_y(rect);
- for (int a = 0; a < 6; a++) {
- tria->vec[a][0] = size * g_shape_preset_checkmark_vert[a][0] + centx;
- tria->vec[a][1] = size * g_shape_preset_checkmark_vert[a][1] + centy;
- }
+ for (int a = 0; a < 6; a++) {
+ tria->vec[a][0] = size * g_shape_preset_checkmark_vert[a][0] + centx;
+ tria->vec[a][1] = size * g_shape_preset_checkmark_vert[a][1] + centy;
+ }
- tria->tot = 4;
- tria->index = g_shape_preset_checkmark_face;
+ tria->tot = 4;
+ tria->index = g_shape_preset_checkmark_face;
}
/** \} */
-
/* prepares shade colors */
-static void shadecolors4(char coltop[4], char coldown[4], const char *color, short shadetop, short shadedown)
+static void shadecolors4(
+ char coltop[4], char coldown[4], const char *color, short shadetop, short shadedown)
{
- coltop[0] = CLAMPIS(color[0] + shadetop, 0, 255);
- coltop[1] = CLAMPIS(color[1] + shadetop, 0, 255);
- coltop[2] = CLAMPIS(color[2] + shadetop, 0, 255);
- coltop[3] = color[3];
-
- coldown[0] = CLAMPIS(color[0] + shadedown, 0, 255);
- coldown[1] = CLAMPIS(color[1] + shadedown, 0, 255);
- coldown[2] = CLAMPIS(color[2] + shadedown, 0, 255);
- coldown[3] = color[3];
+ coltop[0] = CLAMPIS(color[0] + shadetop, 0, 255);
+ coltop[1] = CLAMPIS(color[1] + shadetop, 0, 255);
+ coltop[2] = CLAMPIS(color[2] + shadetop, 0, 255);
+ coltop[3] = color[3];
+
+ coldown[0] = CLAMPIS(color[0] + shadedown, 0, 255);
+ coldown[1] = CLAMPIS(color[1] + shadedown, 0, 255);
+ coldown[2] = CLAMPIS(color[2] + shadedown, 0, 255);
+ coldown[3] = color[3];
}
-static void round_box_shade_col4_r(uchar r_col[4], const char col1[4], const char col2[4], const float fac)
+static void round_box_shade_col4_r(uchar r_col[4],
+ const char col1[4],
+ const char col2[4],
+ const float fac)
{
- const int faci = unit_float_to_uchar_clamp(fac);
- const int facm = 255 - faci;
+ const int faci = unit_float_to_uchar_clamp(fac);
+ const int facm = 255 - faci;
- r_col[0] = (faci * col1[0] + facm * col2[0]) / 256;
- r_col[1] = (faci * col1[1] + facm * col2[1]) / 256;
- r_col[2] = (faci * col1[2] + facm * col2[2]) / 256;
- r_col[3] = (faci * col1[3] + facm * col2[3]) / 256;
+ r_col[0] = (faci * col1[0] + facm * col2[0]) / 256;
+ r_col[1] = (faci * col1[1] + facm * col2[1]) / 256;
+ r_col[2] = (faci * col1[2] + facm * col2[2]) / 256;
+ r_col[3] = (faci * col1[3] + facm * col2[3]) / 256;
}
-static void widget_verts_to_triangle_strip(uiWidgetBase *wtb, const int totvert, float triangle_strip[WIDGET_SIZE_MAX * 2 + 2][2])
+static void widget_verts_to_triangle_strip(uiWidgetBase *wtb,
+ const int totvert,
+ float triangle_strip[WIDGET_SIZE_MAX * 2 + 2][2])
{
- int a;
- for (a = 0; a < totvert; a++) {
- copy_v2_v2(triangle_strip[a * 2], wtb->outer_v[a]);
- copy_v2_v2(triangle_strip[a * 2 + 1], wtb->inner_v[a]);
- }
- copy_v2_v2(triangle_strip[a * 2], wtb->outer_v[0]);
- copy_v2_v2(triangle_strip[a * 2 + 1], wtb->inner_v[0]);
+ int a;
+ for (a = 0; a < totvert; a++) {
+ copy_v2_v2(triangle_strip[a * 2], wtb->outer_v[a]);
+ copy_v2_v2(triangle_strip[a * 2 + 1], wtb->inner_v[a]);
+ }
+ copy_v2_v2(triangle_strip[a * 2], wtb->outer_v[0]);
+ copy_v2_v2(triangle_strip[a * 2 + 1], wtb->inner_v[0]);
}
static void widgetbase_outline(uiWidgetBase *wtb, uint pos)
{
- float triangle_strip[WIDGET_SIZE_MAX * 2 + 2][2]; /* + 2 because the last pair is wrapped */
- widget_verts_to_triangle_strip(wtb, wtb->totvert, triangle_strip);
+ float triangle_strip[WIDGET_SIZE_MAX * 2 + 2][2]; /* + 2 because the last pair is wrapped */
+ widget_verts_to_triangle_strip(wtb, wtb->totvert, triangle_strip);
- widget_draw_vertex_buffer(pos, 0, GL_TRIANGLE_STRIP, triangle_strip, NULL, wtb->totvert * 2 + 2);
+ widget_draw_vertex_buffer(pos, 0, GL_TRIANGLE_STRIP, triangle_strip, NULL, wtb->totvert * 2 + 2);
}
-static void widgetbase_set_uniform_alpha_discard(
- uiWidgetBase *wtb,
- const bool alpha_check,
- const float discard_factor)
+static void widgetbase_set_uniform_alpha_discard(uiWidgetBase *wtb,
+ const bool alpha_check,
+ const float discard_factor)
{
- if (alpha_check) {
- wtb->uniform_params.alpha_discard = -discard_factor;
- }
- else {
- wtb->uniform_params.alpha_discard = discard_factor;
- }
+ if (alpha_check) {
+ wtb->uniform_params.alpha_discard = -discard_factor;
+ }
+ else {
+ wtb->uniform_params.alpha_discard = discard_factor;
+ }
}
-static void widgetbase_set_uniform_alpha_check(
- uiWidgetBase *wtb,
- const bool alpha_check)
+static void widgetbase_set_uniform_alpha_check(uiWidgetBase *wtb, const bool alpha_check)
{
- const float discard_factor = fabs(wtb->uniform_params.alpha_discard);
- widgetbase_set_uniform_alpha_discard(wtb, alpha_check, discard_factor);
+ const float discard_factor = fabs(wtb->uniform_params.alpha_discard);
+ widgetbase_set_uniform_alpha_discard(wtb, alpha_check, discard_factor);
}
-static void widgetbase_set_uniform_discard_factor(
- uiWidgetBase *wtb,
- const float discard_factor)
+static void widgetbase_set_uniform_discard_factor(uiWidgetBase *wtb, const float discard_factor)
{
- bool alpha_check = wtb->uniform_params.alpha_discard < 0.0f;
- widgetbase_set_uniform_alpha_discard(wtb, alpha_check, discard_factor);
+ bool alpha_check = wtb->uniform_params.alpha_discard < 0.0f;
+ widgetbase_set_uniform_alpha_discard(wtb, alpha_check, discard_factor);
}
-static void widgetbase_set_uniform_colors_ubv(
- uiWidgetBase *wtb,
- const uchar *col1, const uchar *col2,
- const uchar *outline,
- const uchar *emboss,
- const uchar *tria,
- const bool alpha_check)
+static void widgetbase_set_uniform_colors_ubv(uiWidgetBase *wtb,
+ const uchar *col1,
+ const uchar *col2,
+ const uchar *outline,
+ const uchar *emboss,
+ const uchar *tria,
+ const bool alpha_check)
{
- widgetbase_set_uniform_alpha_check(wtb, alpha_check);
- rgba_float_args_set_ch(wtb->uniform_params.color_inner1, col1[0], col1[1], col1[2], col1[3]);
- rgba_float_args_set_ch(wtb->uniform_params.color_inner2, col2[0], col2[1], col2[2], col2[3]);
- rgba_float_args_set_ch(wtb->uniform_params.color_outline, outline[0], outline[1], outline[2], outline[3]);
- rgba_float_args_set_ch(wtb->uniform_params.color_emboss, emboss[0], emboss[1], emboss[2], emboss[3]);
- rgba_float_args_set_ch(wtb->uniform_params.color_tria, tria[0], tria[1], tria[2], tria[3]);
+ widgetbase_set_uniform_alpha_check(wtb, alpha_check);
+ rgba_float_args_set_ch(wtb->uniform_params.color_inner1, col1[0], col1[1], col1[2], col1[3]);
+ rgba_float_args_set_ch(wtb->uniform_params.color_inner2, col2[0], col2[1], col2[2], col2[3]);
+ rgba_float_args_set_ch(
+ wtb->uniform_params.color_outline, outline[0], outline[1], outline[2], outline[3]);
+ rgba_float_args_set_ch(
+ wtb->uniform_params.color_emboss, emboss[0], emboss[1], emboss[2], emboss[3]);
+ rgba_float_args_set_ch(wtb->uniform_params.color_tria, tria[0], tria[1], tria[2], tria[3]);
}
/* keep in sync with shader */
@@ -1145,165 +1229,173 @@ static void widgetbase_set_uniform_colors_ubv(
#define MAX_WIDGET_PARAMETERS 11
static struct {
- GPUBatch *batch; /* Batch type */
- uiWidgetBaseParameters params[MAX_WIDGET_BASE_BATCH];
- int count;
- bool enabled;
+ GPUBatch *batch; /* Batch type */
+ uiWidgetBaseParameters params[MAX_WIDGET_BASE_BATCH];
+ int count;
+ bool enabled;
} g_widget_base_batch = {0};
void UI_widgetbase_draw_cache_flush(void)
{
- float checker_params[3] = {UI_ALPHA_CHECKER_DARK / 255.0f, UI_ALPHA_CHECKER_LIGHT / 255.0f, 8.0f};
-
- if (g_widget_base_batch.count == 0) {
- return;
- }
-
- GPUBatch *batch = g_widget_base_batch.batch;
- if (g_widget_base_batch.count == 1) {
- /* draw single */
- GPU_batch_program_set_builtin(batch, GPU_SHADER_2D_WIDGET_BASE);
- GPU_batch_uniform_4fv_array(batch, "parameters", MAX_WIDGET_PARAMETERS, (float *)g_widget_base_batch.params);
- GPU_batch_uniform_3fv(batch, "checkerColorAndSize", checker_params);
- GPU_batch_draw(batch);
- }
- else {
- GPU_batch_program_set_builtin(batch, GPU_SHADER_2D_WIDGET_BASE_INST);
- GPU_batch_uniform_4fv_array(batch, "parameters", MAX_WIDGET_PARAMETERS * MAX_WIDGET_BASE_BATCH,
- (float *)g_widget_base_batch.params);
- GPU_batch_uniform_3fv(batch, "checkerColorAndSize", checker_params);
- GPU_matrix_bind(batch->interface);
- GPU_batch_draw_range_ex(batch, 0, g_widget_base_batch.count, true);
- GPU_batch_program_use_end(batch);
- }
- g_widget_base_batch.count = 0;
+ float checker_params[3] = {
+ UI_ALPHA_CHECKER_DARK / 255.0f, UI_ALPHA_CHECKER_LIGHT / 255.0f, 8.0f};
+
+ if (g_widget_base_batch.count == 0) {
+ return;
+ }
+
+ GPUBatch *batch = g_widget_base_batch.batch;
+ if (g_widget_base_batch.count == 1) {
+ /* draw single */
+ GPU_batch_program_set_builtin(batch, GPU_SHADER_2D_WIDGET_BASE);
+ GPU_batch_uniform_4fv_array(
+ batch, "parameters", MAX_WIDGET_PARAMETERS, (float *)g_widget_base_batch.params);
+ GPU_batch_uniform_3fv(batch, "checkerColorAndSize", checker_params);
+ GPU_batch_draw(batch);
+ }
+ else {
+ GPU_batch_program_set_builtin(batch, GPU_SHADER_2D_WIDGET_BASE_INST);
+ GPU_batch_uniform_4fv_array(batch,
+ "parameters",
+ MAX_WIDGET_PARAMETERS * MAX_WIDGET_BASE_BATCH,
+ (float *)g_widget_base_batch.params);
+ GPU_batch_uniform_3fv(batch, "checkerColorAndSize", checker_params);
+ GPU_matrix_bind(batch->interface);
+ GPU_batch_draw_range_ex(batch, 0, g_widget_base_batch.count, true);
+ GPU_batch_program_use_end(batch);
+ }
+ g_widget_base_batch.count = 0;
}
void UI_widgetbase_draw_cache_begin(void)
{
- BLI_assert(g_widget_base_batch.enabled == false);
- g_widget_base_batch.enabled = true;
+ BLI_assert(g_widget_base_batch.enabled == false);
+ g_widget_base_batch.enabled = true;
}
void UI_widgetbase_draw_cache_end(void)
{
- BLI_assert(g_widget_base_batch.enabled == true);
- g_widget_base_batch.enabled = false;
+ BLI_assert(g_widget_base_batch.enabled == true);
+ g_widget_base_batch.enabled = false;
- GPU_blend(true);
+ GPU_blend(true);
- UI_widgetbase_draw_cache_flush();
+ UI_widgetbase_draw_cache_flush();
- GPU_blend(false);
+ GPU_blend(false);
}
static void draw_widgetbase_batch(GPUBatch *batch, uiWidgetBase *wtb)
{
- wtb->uniform_params.tria1_size = wtb->tria1.size;
- wtb->uniform_params.tria2_size = wtb->tria2.size;
- copy_v2_v2(wtb->uniform_params.tria1_center, wtb->tria1.center);
- copy_v2_v2(wtb->uniform_params.tria2_center, wtb->tria2.center);
-
- if (g_widget_base_batch.enabled) {
- if (g_widget_base_batch.batch == NULL) {
- g_widget_base_batch.batch = ui_batch_roundbox_widget_get(ROUNDBOX_TRIA_ARROWS);
- }
-
- /* draw multi */
- if (batch != g_ui_batch_cache.roundbox_widget[ROUNDBOX_TRIA_NONE] &&
- batch != g_widget_base_batch.batch)
- {
- /* issue previous calls before changing batch type. */
- UI_widgetbase_draw_cache_flush();
- g_widget_base_batch.batch = batch;
- }
-
- /* No need to change batch if tria is not visible. Just scale it to 0. */
- if (batch == g_ui_batch_cache.roundbox_widget[ROUNDBOX_TRIA_NONE]) {
- wtb->uniform_params.tria1_size = wtb->uniform_params.tria2_size = 0;
- }
-
- g_widget_base_batch.params[g_widget_base_batch.count] = wtb->uniform_params;
- g_widget_base_batch.count++;
-
- if (g_widget_base_batch.count == MAX_WIDGET_BASE_BATCH) {
- UI_widgetbase_draw_cache_flush();
- }
- }
- else {
- float checker_params[3] = {UI_ALPHA_CHECKER_DARK / 255.0f, UI_ALPHA_CHECKER_LIGHT / 255.0f, 8.0f};
- /* draw single */
- GPU_batch_program_set_builtin(batch, GPU_SHADER_2D_WIDGET_BASE);
- GPU_batch_uniform_4fv_array(batch, "parameters", MAX_WIDGET_PARAMETERS, (float *)&wtb->uniform_params);
- GPU_batch_uniform_3fv(batch, "checkerColorAndSize", checker_params);
- GPU_batch_draw(batch);
- }
+ wtb->uniform_params.tria1_size = wtb->tria1.size;
+ wtb->uniform_params.tria2_size = wtb->tria2.size;
+ copy_v2_v2(wtb->uniform_params.tria1_center, wtb->tria1.center);
+ copy_v2_v2(wtb->uniform_params.tria2_center, wtb->tria2.center);
+
+ if (g_widget_base_batch.enabled) {
+ if (g_widget_base_batch.batch == NULL) {
+ g_widget_base_batch.batch = ui_batch_roundbox_widget_get(ROUNDBOX_TRIA_ARROWS);
+ }
+
+ /* draw multi */
+ if (batch != g_ui_batch_cache.roundbox_widget[ROUNDBOX_TRIA_NONE] &&
+ batch != g_widget_base_batch.batch) {
+ /* issue previous calls before changing batch type. */
+ UI_widgetbase_draw_cache_flush();
+ g_widget_base_batch.batch = batch;
+ }
+
+ /* No need to change batch if tria is not visible. Just scale it to 0. */
+ if (batch == g_ui_batch_cache.roundbox_widget[ROUNDBOX_TRIA_NONE]) {
+ wtb->uniform_params.tria1_size = wtb->uniform_params.tria2_size = 0;
+ }
+
+ g_widget_base_batch.params[g_widget_base_batch.count] = wtb->uniform_params;
+ g_widget_base_batch.count++;
+
+ if (g_widget_base_batch.count == MAX_WIDGET_BASE_BATCH) {
+ UI_widgetbase_draw_cache_flush();
+ }
+ }
+ else {
+ float checker_params[3] = {
+ UI_ALPHA_CHECKER_DARK / 255.0f, UI_ALPHA_CHECKER_LIGHT / 255.0f, 8.0f};
+ /* draw single */
+ GPU_batch_program_set_builtin(batch, GPU_SHADER_2D_WIDGET_BASE);
+ GPU_batch_uniform_4fv_array(
+ batch, "parameters", MAX_WIDGET_PARAMETERS, (float *)&wtb->uniform_params);
+ GPU_batch_uniform_3fv(batch, "checkerColorAndSize", checker_params);
+ GPU_batch_draw(batch);
+ }
}
-static void widgetbase_draw_ex(
- uiWidgetBase *wtb, const uiWidgetColors *wcol,
- bool show_alpha_checkers)
+static void widgetbase_draw_ex(uiWidgetBase *wtb,
+ const uiWidgetColors *wcol,
+ bool show_alpha_checkers)
{
- uchar inner_col1[4] = {0};
- uchar inner_col2[4] = {0};
- uchar emboss_col[4] = {0};
- uchar outline_col[4] = {0};
- uchar tria_col[4] = {0};
- /* For color widget. */
- if (wcol->shaded != 0) {
- show_alpha_checkers = false;
- }
-
- GPU_blend(true);
-
- /* backdrop non AA */
- if (wtb->draw_inner) {
- if (wcol->shaded == 0) {
- /* simple fill */
- inner_col1[0] = inner_col2[0] = (uchar)wcol->inner[0];
- inner_col1[1] = inner_col2[1] = (uchar)wcol->inner[1];
- inner_col1[2] = inner_col2[2] = (uchar)wcol->inner[2];
- inner_col1[3] = inner_col2[3] = (uchar)wcol->inner[3];
- }
- else {
- /* gradient fill */
- shadecolors4((char *)inner_col1, (char *)inner_col2, wcol->inner, wcol->shadetop, wcol->shadedown);
- }
- }
-
- if (wtb->draw_outline) {
- outline_col[0] = wcol->outline[0];
- outline_col[1] = wcol->outline[1];
- outline_col[2] = wcol->outline[2];
- outline_col[3] = wcol->outline[3] / WIDGET_AA_JITTER;
-
- /* emboss bottom shadow */
- if (wtb->draw_emboss) {
- UI_GetThemeColor4ubv(TH_WIDGET_EMBOSS, emboss_col);
- }
- }
-
- if (wtb->tria1.type != ROUNDBOX_TRIA_NONE) {
- tria_col[0] = wcol->item[0];
- tria_col[1] = wcol->item[1];
- tria_col[2] = wcol->item[2];
- tria_col[3] = (uchar)((float)wcol->item[3] / WIDGET_AA_JITTER);
- }
-
- /* Draw everything in one drawcall */
- if (inner_col1[3] || inner_col2[3] || outline_col[3] || emboss_col[3] || tria_col[3] || show_alpha_checkers) {
- widgetbase_set_uniform_colors_ubv(wtb, inner_col1, inner_col2, outline_col, emboss_col, tria_col, show_alpha_checkers);
-
- GPUBatch *roundbox_batch = ui_batch_roundbox_widget_get(wtb->tria1.type);
- draw_widgetbase_batch(roundbox_batch, wtb);
- }
-
- GPU_blend(false);
+ uchar inner_col1[4] = {0};
+ uchar inner_col2[4] = {0};
+ uchar emboss_col[4] = {0};
+ uchar outline_col[4] = {0};
+ uchar tria_col[4] = {0};
+ /* For color widget. */
+ if (wcol->shaded != 0) {
+ show_alpha_checkers = false;
+ }
+
+ GPU_blend(true);
+
+ /* backdrop non AA */
+ if (wtb->draw_inner) {
+ if (wcol->shaded == 0) {
+ /* simple fill */
+ inner_col1[0] = inner_col2[0] = (uchar)wcol->inner[0];
+ inner_col1[1] = inner_col2[1] = (uchar)wcol->inner[1];
+ inner_col1[2] = inner_col2[2] = (uchar)wcol->inner[2];
+ inner_col1[3] = inner_col2[3] = (uchar)wcol->inner[3];
+ }
+ else {
+ /* gradient fill */
+ shadecolors4(
+ (char *)inner_col1, (char *)inner_col2, wcol->inner, wcol->shadetop, wcol->shadedown);
+ }
+ }
+
+ if (wtb->draw_outline) {
+ outline_col[0] = wcol->outline[0];
+ outline_col[1] = wcol->outline[1];
+ outline_col[2] = wcol->outline[2];
+ outline_col[3] = wcol->outline[3] / WIDGET_AA_JITTER;
+
+ /* emboss bottom shadow */
+ if (wtb->draw_emboss) {
+ UI_GetThemeColor4ubv(TH_WIDGET_EMBOSS, emboss_col);
+ }
+ }
+
+ if (wtb->tria1.type != ROUNDBOX_TRIA_NONE) {
+ tria_col[0] = wcol->item[0];
+ tria_col[1] = wcol->item[1];
+ tria_col[2] = wcol->item[2];
+ tria_col[3] = (uchar)((float)wcol->item[3] / WIDGET_AA_JITTER);
+ }
+
+ /* Draw everything in one drawcall */
+ if (inner_col1[3] || inner_col2[3] || outline_col[3] || emboss_col[3] || tria_col[3] ||
+ show_alpha_checkers) {
+ widgetbase_set_uniform_colors_ubv(
+ wtb, inner_col1, inner_col2, outline_col, emboss_col, tria_col, show_alpha_checkers);
+
+ GPUBatch *roundbox_batch = ui_batch_roundbox_widget_get(wtb->tria1.type);
+ draw_widgetbase_batch(roundbox_batch, wtb);
+ }
+
+ GPU_blend(false);
}
static void widgetbase_draw(uiWidgetBase *wtb, const uiWidgetColors *wcol)
{
- widgetbase_draw_ex(wtb, wcol, false);
+ widgetbase_draw_ex(wtb, wcol, false);
}
/* *********************** text/icon ************************************** */
@@ -1314,160 +1406,162 @@ static void widgetbase_draw(uiWidgetBase *wtb, const uiWidgetColors *wcol)
static void widget_draw_preview(BIFIconID icon, float alpha, const rcti *rect)
{
- int w, h, size;
+ int w, h, size;
- if (icon == ICON_NONE) {
- return;
- }
+ if (icon == ICON_NONE) {
+ return;
+ }
- w = BLI_rcti_size_x(rect);
- h = BLI_rcti_size_y(rect);
- size = MIN2(w, h);
- size -= PREVIEW_PAD * 2; /* padding */
+ w = BLI_rcti_size_x(rect);
+ h = BLI_rcti_size_y(rect);
+ size = MIN2(w, h);
+ size -= PREVIEW_PAD * 2; /* padding */
- if (size > 0) {
- int x = rect->xmin + w / 2 - size / 2;
- int y = rect->ymin + h / 2 - size / 2;
+ if (size > 0) {
+ int x = rect->xmin + w / 2 - size / 2;
+ int y = rect->ymin + h / 2 - size / 2;
- UI_icon_draw_preview_aspect_size(x, y, icon, 1.0f, alpha, size);
- }
+ UI_icon_draw_preview_aspect_size(x, y, icon, 1.0f, alpha, size);
+ }
}
-
static int ui_but_draw_menu_icon(const uiBut *but)
{
- return (but->flag & UI_BUT_ICON_SUBMENU) && (but->dt == UI_EMBOSS_PULLDOWN);
+ return (but->flag & UI_BUT_ICON_SUBMENU) && (but->dt == UI_EMBOSS_PULLDOWN);
}
/* icons have been standardized... and this call draws in untransformed coordinates */
static void widget_draw_icon(
- const uiBut *but, BIFIconID icon, float alpha,
- const rcti *rect, const char mono_color[4])
+ const uiBut *but, BIFIconID icon, float alpha, const rcti *rect, const char mono_color[4])
{
- float xs = 0.0f, ys = 0.0f;
- float aspect, height;
-
- if (but->flag & UI_BUT_ICON_PREVIEW) {
- GPU_blend(true);
- widget_draw_preview(icon, alpha, rect);
- GPU_blend(false);
- return;
- }
-
- /* this icon doesn't need draw... */
- if (icon == ICON_BLANK1 && (but->flag & UI_BUT_ICON_SUBMENU) == 0) {
- return;
- }
-
- aspect = but->block->aspect / UI_DPI_FAC;
- height = ICON_DEFAULT_HEIGHT / aspect;
-
- /* calculate blend color */
- if (ELEM(but->type, UI_BTYPE_TOGGLE, UI_BTYPE_ROW, UI_BTYPE_TOGGLE_N, UI_BTYPE_LISTROW)) {
- if (but->flag & UI_SELECT) {
- /* pass */
- }
- else if (but->flag & UI_ACTIVE) {
- /* pass */
- }
- else {
- alpha = 0.75f;
- }
- }
- else if ((but->type == UI_BTYPE_LABEL)) {
- /* extra feature allows more alpha blending */
- if (but->a1 == 1.0f) {
- alpha *= but->a2;
- }
- }
- else if (ELEM(but->type, UI_BTYPE_BUT)) {
- if (but->flag & UI_BUT_DISABLED) {
- alpha *= 0.5f;
- }
- }
-
- GPU_blend(true);
-
- if (icon && icon != ICON_BLANK1) {
- float ofs = 1.0f / aspect;
-
- if (but->drawflag & UI_BUT_ICON_LEFT) {
- /* special case - icon_only pie buttons */
- if (ui_block_is_pie_menu(but->block) && !ELEM(but->type, UI_BTYPE_MENU, UI_BTYPE_POPOVER) && but->str && but->str[0] == '\0') {
- xs = rect->xmin + 2.0f * ofs;
- }
- else if (but->dt == UI_EMBOSS_NONE || but->type == UI_BTYPE_LABEL) {
- xs = rect->xmin + 2.0f * ofs;
- }
- else {
- xs = rect->xmin + 4.0f * ofs;
- }
- }
- else {
- xs = (rect->xmin + rect->xmax - height) / 2.0f;
- }
- ys = (rect->ymin + rect->ymax - height) / 2.0f;
-
- /* force positions to integers, for zoom levels near 1. draws icons crisp. */
- if (aspect > 0.95f && aspect < 1.05f) {
- xs = (int)(xs + 0.1f);
- ys = (int)(ys + 0.1f);
- }
-
- /* to indicate draggable */
- if (but->dragpoin && (but->flag & UI_ACTIVE)) {
- float rgb[3] = {1.25f, 1.25f, 1.25f};
- UI_icon_draw_aspect_color(xs, ys, icon, aspect, rgb, mono_color);
- }
- else if ((but->flag & (UI_ACTIVE | UI_SELECT | UI_SELECT_DRAW)) || !UI_but_is_tool(but)) {
- UI_icon_draw_aspect(xs, ys, icon, aspect, alpha, mono_color);
- }
- else {
- const bTheme *btheme = UI_GetTheme();
- UI_icon_draw_desaturate(xs, ys, icon, aspect, alpha, 1.0 - btheme->tui.icon_saturation, mono_color);
- }
- }
-
- GPU_blend(false);
+ float xs = 0.0f, ys = 0.0f;
+ float aspect, height;
+
+ if (but->flag & UI_BUT_ICON_PREVIEW) {
+ GPU_blend(true);
+ widget_draw_preview(icon, alpha, rect);
+ GPU_blend(false);
+ return;
+ }
+
+ /* this icon doesn't need draw... */
+ if (icon == ICON_BLANK1 && (but->flag & UI_BUT_ICON_SUBMENU) == 0) {
+ return;
+ }
+
+ aspect = but->block->aspect / UI_DPI_FAC;
+ height = ICON_DEFAULT_HEIGHT / aspect;
+
+ /* calculate blend color */
+ if (ELEM(but->type, UI_BTYPE_TOGGLE, UI_BTYPE_ROW, UI_BTYPE_TOGGLE_N, UI_BTYPE_LISTROW)) {
+ if (but->flag & UI_SELECT) {
+ /* pass */
+ }
+ else if (but->flag & UI_ACTIVE) {
+ /* pass */
+ }
+ else {
+ alpha = 0.75f;
+ }
+ }
+ else if ((but->type == UI_BTYPE_LABEL)) {
+ /* extra feature allows more alpha blending */
+ if (but->a1 == 1.0f) {
+ alpha *= but->a2;
+ }
+ }
+ else if (ELEM(but->type, UI_BTYPE_BUT)) {
+ if (but->flag & UI_BUT_DISABLED) {
+ alpha *= 0.5f;
+ }
+ }
+
+ GPU_blend(true);
+
+ if (icon && icon != ICON_BLANK1) {
+ float ofs = 1.0f / aspect;
+
+ if (but->drawflag & UI_BUT_ICON_LEFT) {
+ /* special case - icon_only pie buttons */
+ if (ui_block_is_pie_menu(but->block) && !ELEM(but->type, UI_BTYPE_MENU, UI_BTYPE_POPOVER) &&
+ but->str && but->str[0] == '\0') {
+ xs = rect->xmin + 2.0f * ofs;
+ }
+ else if (but->dt == UI_EMBOSS_NONE || but->type == UI_BTYPE_LABEL) {
+ xs = rect->xmin + 2.0f * ofs;
+ }
+ else {
+ xs = rect->xmin + 4.0f * ofs;
+ }
+ }
+ else {
+ xs = (rect->xmin + rect->xmax - height) / 2.0f;
+ }
+ ys = (rect->ymin + rect->ymax - height) / 2.0f;
+
+ /* force positions to integers, for zoom levels near 1. draws icons crisp. */
+ if (aspect > 0.95f && aspect < 1.05f) {
+ xs = (int)(xs + 0.1f);
+ ys = (int)(ys + 0.1f);
+ }
+
+ /* to indicate draggable */
+ if (but->dragpoin && (but->flag & UI_ACTIVE)) {
+ float rgb[3] = {1.25f, 1.25f, 1.25f};
+ UI_icon_draw_aspect_color(xs, ys, icon, aspect, rgb, mono_color);
+ }
+ else if ((but->flag & (UI_ACTIVE | UI_SELECT | UI_SELECT_DRAW)) || !UI_but_is_tool(but)) {
+ UI_icon_draw_aspect(xs, ys, icon, aspect, alpha, mono_color);
+ }
+ else {
+ const bTheme *btheme = UI_GetTheme();
+ UI_icon_draw_desaturate(
+ xs, ys, icon, aspect, alpha, 1.0 - btheme->tui.icon_saturation, mono_color);
+ }
+ }
+
+ GPU_blend(false);
}
-static void widget_draw_submenu_tria(const uiBut *but, const rcti *rect, const uiWidgetColors *wcol)
+static void widget_draw_submenu_tria(const uiBut *but,
+ const rcti *rect,
+ const uiWidgetColors *wcol)
{
- const float aspect = but->block->aspect / UI_DPI_FAC;
- const int tria_height = (int)(ICON_DEFAULT_HEIGHT / aspect);
- const int tria_width = (int)(ICON_DEFAULT_WIDTH / aspect) - 2 * U.pixelsize;
- const int xs = rect->xmax - tria_width;
- const int ys = (rect->ymin + rect->ymax - tria_height) / 2.0f;
- float col[4];
- rctf tria_rect;
-
- rgba_uchar_to_float(col, (const uchar *)wcol->text);
- col[3] *= 0.8f;
-
- BLI_rctf_init(&tria_rect, xs, xs + tria_width, ys, ys + tria_height);
- BLI_rctf_scale(&tria_rect, 0.4f);
-
- GPU_blend(true);
- UI_widgetbase_draw_cache_flush();
- GPU_blend(false);
- ui_draw_anti_tria_rect(&tria_rect, 'h', col);
+ const float aspect = but->block->aspect / UI_DPI_FAC;
+ const int tria_height = (int)(ICON_DEFAULT_HEIGHT / aspect);
+ const int tria_width = (int)(ICON_DEFAULT_WIDTH / aspect) - 2 * U.pixelsize;
+ const int xs = rect->xmax - tria_width;
+ const int ys = (rect->ymin + rect->ymax - tria_height) / 2.0f;
+ float col[4];
+ rctf tria_rect;
+
+ rgba_uchar_to_float(col, (const uchar *)wcol->text);
+ col[3] *= 0.8f;
+
+ BLI_rctf_init(&tria_rect, xs, xs + tria_width, ys, ys + tria_height);
+ BLI_rctf_scale(&tria_rect, 0.4f);
+
+ GPU_blend(true);
+ UI_widgetbase_draw_cache_flush();
+ GPU_blend(false);
+ ui_draw_anti_tria_rect(&tria_rect, 'h', col);
}
static void ui_text_clip_give_prev_off(uiBut *but, const char *str)
{
- const char *prev_utf8 = BLI_str_find_prev_char_utf8(str, str + but->ofs);
- int bytes = str + but->ofs - prev_utf8;
+ const char *prev_utf8 = BLI_str_find_prev_char_utf8(str, str + but->ofs);
+ int bytes = str + but->ofs - prev_utf8;
- but->ofs -= bytes;
+ but->ofs -= bytes;
}
static void ui_text_clip_give_next_off(uiBut *but, const char *str)
{
- const char *next_utf8 = BLI_str_find_next_char_utf8(str + but->ofs, NULL);
- int bytes = next_utf8 - (str + but->ofs);
+ const char *next_utf8 = BLI_str_find_next_char_utf8(str + but->ofs, NULL);
+ int bytes = next_utf8 - (str + but->ofs);
- but->ofs += bytes;
+ but->ofs += bytes;
}
/**
@@ -1475,32 +1569,37 @@ static void ui_text_clip_give_next_off(uiBut *but, const char *str)
* This func assumes things like kerning handling have already been handled!
* Return the length of modified (right-clipped + ellipsis) string.
*/
-static void ui_text_clip_right_ex(
- const uiFontStyle *fstyle, char *str, const size_t max_len, const float okwidth,
- const char *sep, const int sep_len, const float sep_strwidth, size_t *r_final_len)
+static void ui_text_clip_right_ex(const uiFontStyle *fstyle,
+ char *str,
+ const size_t max_len,
+ const float okwidth,
+ const char *sep,
+ const int sep_len,
+ const float sep_strwidth,
+ size_t *r_final_len)
{
- float tmp;
- int l_end;
-
- BLI_assert(str[0]);
-
- /* If the trailing ellipsis takes more than 20% of all available width, just cut the string
- * (as using the ellipsis would remove even more useful chars, and we cannot show much already!).
- */
- if (sep_strwidth / okwidth > 0.2f) {
- l_end = BLF_width_to_strlen(fstyle->uifont_id, str, max_len, okwidth, &tmp);
- str[l_end] = '\0';
- if (r_final_len) {
- *r_final_len = (size_t)l_end;
- }
- }
- else {
- l_end = BLF_width_to_strlen(fstyle->uifont_id, str, max_len, okwidth - sep_strwidth, &tmp);
- memcpy(str + l_end, sep, sep_len + 1); /* +1 for trailing '\0'. */
- if (r_final_len) {
- *r_final_len = (size_t)(l_end + sep_len);
- }
- }
+ float tmp;
+ int l_end;
+
+ BLI_assert(str[0]);
+
+ /* If the trailing ellipsis takes more than 20% of all available width, just cut the string
+ * (as using the ellipsis would remove even more useful chars, and we cannot show much already!).
+ */
+ if (sep_strwidth / okwidth > 0.2f) {
+ l_end = BLF_width_to_strlen(fstyle->uifont_id, str, max_len, okwidth, &tmp);
+ str[l_end] = '\0';
+ if (r_final_len) {
+ *r_final_len = (size_t)l_end;
+ }
+ }
+ else {
+ l_end = BLF_width_to_strlen(fstyle->uifont_id, str, max_len, okwidth - sep_strwidth, &tmp);
+ memcpy(str + l_end, sep, sep_len + 1); /* +1 for trailing '\0'. */
+ if (r_final_len) {
+ *r_final_len = (size_t)(l_end + sep_len);
+ }
+ }
}
/**
@@ -1509,126 +1608,131 @@ static void ui_text_clip_right_ex(
* If rpart_sep is not Null, the part of str starting to first occurrence of rpart_sep is preserved at all cost (useful
* for strings with shortcuts, like 'AVeryLongFooBarLabelForMenuEntry|Ctrl O' -> 'AVeryLong...MenuEntry|Ctrl O').
*/
-float UI_text_clip_middle_ex(
- const uiFontStyle *fstyle, char *str, float okwidth, const float minwidth,
- const size_t max_len, const char rpart_sep)
+float UI_text_clip_middle_ex(const uiFontStyle *fstyle,
+ char *str,
+ float okwidth,
+ const float minwidth,
+ const size_t max_len,
+ const char rpart_sep)
{
- float strwidth;
-
- /* Add some epsilon to OK width, avoids 'ellipsing' text that nearly fits!
- * Better to have a small piece of the last char cut out,
- * than two remaining chars replaced by an ellipsis... */
- okwidth += 1.0f + UI_DPI_FAC;
-
- BLI_assert(str[0]);
-
- /* need to set this first */
- UI_fontstyle_set(fstyle);
-
- if (fstyle->kerning == 1) {
- /* for BLF_width */
- BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
- }
-
- strwidth = BLF_width(fstyle->uifont_id, str, max_len);
-
- if ((okwidth > 0.0f) && (strwidth > okwidth)) {
- /* utf8 two-dots leader '..' (shorter than ellipsis '...'),
- * some compilers complain with real litteral string. */
- const char sep[] = {0xe2, 0x80, 0xA5, 0x0};
- const int sep_len = sizeof(sep) - 1;
- const float sep_strwidth = BLF_width(fstyle->uifont_id, sep, sep_len + 1);
- float parts_strwidth;
- size_t l_end;
-
- char *rpart = NULL, rpart_buf[UI_MAX_DRAW_STR];
- float rpart_width = 0.0f;
- size_t rpart_len = 0;
- size_t final_lpart_len;
-
- if (rpart_sep) {
- rpart = strrchr(str, rpart_sep);
-
- if (rpart) {
- rpart_len = strlen(rpart);
- rpart_width = BLF_width(fstyle->uifont_id, rpart, rpart_len);
- okwidth -= rpart_width;
- strwidth -= rpart_width;
-
- if (okwidth < 0.0f) {
- /* Not enough place for actual label, just display protected right part.
- * Here just for safety, should never happen in real life! */
- memmove(str, rpart, rpart_len + 1);
- rpart = NULL;
- okwidth += rpart_width;
- strwidth = rpart_width;
- }
- }
- }
-
- parts_strwidth = (okwidth - sep_strwidth) / 2.0f;
-
- if (rpart) {
- strcpy(rpart_buf, rpart);
- *rpart = '\0';
- rpart = rpart_buf;
- }
-
- l_end = BLF_width_to_strlen(fstyle->uifont_id, str, max_len, parts_strwidth, NULL);
- if (l_end < 10 || min_ff(parts_strwidth, strwidth - okwidth) < minwidth) {
- /* If we really have no place, or we would clip a very small piece of string in the middle,
- * only show start of string.
- */
- ui_text_clip_right_ex(fstyle, str, max_len, okwidth, sep, sep_len, sep_strwidth, &final_lpart_len);
- }
- else {
- size_t r_offset, r_len;
-
- r_offset = BLF_width_to_rstrlen(fstyle->uifont_id, str, max_len, parts_strwidth, NULL);
- r_len = strlen(str + r_offset) + 1; /* +1 for the trailing '\0'. */
-
- if (l_end + sep_len + r_len + rpart_len > max_len) {
- /* Corner case, the str already takes all available mem, and the ellipsis chars would actually
- * add more chars...
- * Better to just trim one or two letters to the right in this case...
- * Note: with a single-char ellipsis, this should never happen! But better be safe here...
- */
- ui_text_clip_right_ex(fstyle, str, max_len, okwidth, sep, sep_len, sep_strwidth, &final_lpart_len);
- }
- else {
- memmove(str + l_end + sep_len, str + r_offset, r_len);
- memcpy(str + l_end, sep, sep_len);
- /* -1 to remove trailing '\0'! */
- final_lpart_len = (size_t)(l_end + sep_len + r_len - 1);
-
- while (BLF_width(fstyle->uifont_id, str, max_len) > okwidth) {
- /* This will happen because a lot of string width processing is done in integer pixels,
- * which can introduce a rather high error in the end (about 2 pixels or so).
- * Only one char removal shall ever be needed in real-life situation... */
- r_len--;
- final_lpart_len--;
- char *c = str + l_end + sep_len;
- memmove(c, c + 1, r_len);
- }
- }
- }
-
- if (rpart) {
- /* Add back preserved right part to our shorten str. */
- memcpy(str + final_lpart_len, rpart, rpart_len + 1); /* +1 for trailing '\0'. */
- okwidth += rpart_width;
- }
-
- strwidth = BLF_width(fstyle->uifont_id, str, max_len);
- }
-
- if (fstyle->kerning == 1) {
- BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
- }
-
- BLI_assert(strwidth <= okwidth);
-
- return strwidth;
+ float strwidth;
+
+ /* Add some epsilon to OK width, avoids 'ellipsing' text that nearly fits!
+ * Better to have a small piece of the last char cut out,
+ * than two remaining chars replaced by an ellipsis... */
+ okwidth += 1.0f + UI_DPI_FAC;
+
+ BLI_assert(str[0]);
+
+ /* need to set this first */
+ UI_fontstyle_set(fstyle);
+
+ if (fstyle->kerning == 1) {
+ /* for BLF_width */
+ BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
+ }
+
+ strwidth = BLF_width(fstyle->uifont_id, str, max_len);
+
+ if ((okwidth > 0.0f) && (strwidth > okwidth)) {
+ /* utf8 two-dots leader '..' (shorter than ellipsis '...'),
+ * some compilers complain with real litteral string. */
+ const char sep[] = {0xe2, 0x80, 0xA5, 0x0};
+ const int sep_len = sizeof(sep) - 1;
+ const float sep_strwidth = BLF_width(fstyle->uifont_id, sep, sep_len + 1);
+ float parts_strwidth;
+ size_t l_end;
+
+ char *rpart = NULL, rpart_buf[UI_MAX_DRAW_STR];
+ float rpart_width = 0.0f;
+ size_t rpart_len = 0;
+ size_t final_lpart_len;
+
+ if (rpart_sep) {
+ rpart = strrchr(str, rpart_sep);
+
+ if (rpart) {
+ rpart_len = strlen(rpart);
+ rpart_width = BLF_width(fstyle->uifont_id, rpart, rpart_len);
+ okwidth -= rpart_width;
+ strwidth -= rpart_width;
+
+ if (okwidth < 0.0f) {
+ /* Not enough place for actual label, just display protected right part.
+ * Here just for safety, should never happen in real life! */
+ memmove(str, rpart, rpart_len + 1);
+ rpart = NULL;
+ okwidth += rpart_width;
+ strwidth = rpart_width;
+ }
+ }
+ }
+
+ parts_strwidth = (okwidth - sep_strwidth) / 2.0f;
+
+ if (rpart) {
+ strcpy(rpart_buf, rpart);
+ *rpart = '\0';
+ rpart = rpart_buf;
+ }
+
+ l_end = BLF_width_to_strlen(fstyle->uifont_id, str, max_len, parts_strwidth, NULL);
+ if (l_end < 10 || min_ff(parts_strwidth, strwidth - okwidth) < minwidth) {
+ /* If we really have no place, or we would clip a very small piece of string in the middle,
+ * only show start of string.
+ */
+ ui_text_clip_right_ex(
+ fstyle, str, max_len, okwidth, sep, sep_len, sep_strwidth, &final_lpart_len);
+ }
+ else {
+ size_t r_offset, r_len;
+
+ r_offset = BLF_width_to_rstrlen(fstyle->uifont_id, str, max_len, parts_strwidth, NULL);
+ r_len = strlen(str + r_offset) + 1; /* +1 for the trailing '\0'. */
+
+ if (l_end + sep_len + r_len + rpart_len > max_len) {
+ /* Corner case, the str already takes all available mem, and the ellipsis chars would actually
+ * add more chars...
+ * Better to just trim one or two letters to the right in this case...
+ * Note: with a single-char ellipsis, this should never happen! But better be safe here...
+ */
+ ui_text_clip_right_ex(
+ fstyle, str, max_len, okwidth, sep, sep_len, sep_strwidth, &final_lpart_len);
+ }
+ else {
+ memmove(str + l_end + sep_len, str + r_offset, r_len);
+ memcpy(str + l_end, sep, sep_len);
+ /* -1 to remove trailing '\0'! */
+ final_lpart_len = (size_t)(l_end + sep_len + r_len - 1);
+
+ while (BLF_width(fstyle->uifont_id, str, max_len) > okwidth) {
+ /* This will happen because a lot of string width processing is done in integer pixels,
+ * which can introduce a rather high error in the end (about 2 pixels or so).
+ * Only one char removal shall ever be needed in real-life situation... */
+ r_len--;
+ final_lpart_len--;
+ char *c = str + l_end + sep_len;
+ memmove(c, c + 1, r_len);
+ }
+ }
+ }
+
+ if (rpart) {
+ /* Add back preserved right part to our shorten str. */
+ memcpy(str + final_lpart_len, rpart, rpart_len + 1); /* +1 for trailing '\0'. */
+ okwidth += rpart_width;
+ }
+
+ strwidth = BLF_width(fstyle->uifont_id, str, max_len);
+ }
+
+ if (fstyle->kerning == 1) {
+ BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
+ }
+
+ BLI_assert(strwidth <= okwidth);
+
+ return strwidth;
}
/**
@@ -1636,30 +1740,37 @@ float UI_text_clip_middle_ex(
*/
static void ui_text_clip_middle(const uiFontStyle *fstyle, uiBut *but, const rcti *rect)
{
- /* No margin for labels! */
- const int border = ELEM(but->type, UI_BTYPE_LABEL, UI_BTYPE_MENU, UI_BTYPE_POPOVER) ? 0 : (int)(UI_TEXT_CLIP_MARGIN + 0.5f);
- const float okwidth = (float)max_ii(BLI_rcti_size_x(rect) - border, 0);
- const size_t max_len = sizeof(but->drawstr);
- const float minwidth = (float)(UI_DPI_ICON_SIZE) / but->block->aspect * 2.0f;
-
- but->ofs = 0;
- but->strwidth = UI_text_clip_middle_ex(fstyle, but->drawstr, okwidth, minwidth, max_len, '\0');
+ /* No margin for labels! */
+ const int border = ELEM(but->type, UI_BTYPE_LABEL, UI_BTYPE_MENU, UI_BTYPE_POPOVER) ?
+ 0 :
+ (int)(UI_TEXT_CLIP_MARGIN + 0.5f);
+ const float okwidth = (float)max_ii(BLI_rcti_size_x(rect) - border, 0);
+ const size_t max_len = sizeof(but->drawstr);
+ const float minwidth = (float)(UI_DPI_ICON_SIZE) / but->block->aspect * 2.0f;
+
+ but->ofs = 0;
+ but->strwidth = UI_text_clip_middle_ex(fstyle, but->drawstr, okwidth, minwidth, max_len, '\0');
}
/**
* Like ui_text_clip_middle(), but protect/preserve at all cost the right part of the string after sep.
* Useful for strings with shortcuts (like 'AVeryLongFooBarLabelForMenuEntry|Ctrl O' -> 'AVeryLong...MenuEntry|Ctrl O').
*/
-static void ui_text_clip_middle_protect_right(const uiFontStyle *fstyle, uiBut *but, const rcti *rect, const char rsep)
+static void ui_text_clip_middle_protect_right(const uiFontStyle *fstyle,
+ uiBut *but,
+ const rcti *rect,
+ const char rsep)
{
- /* No margin for labels! */
- const int border = ELEM(but->type, UI_BTYPE_LABEL, UI_BTYPE_MENU, UI_BTYPE_POPOVER) ? 0 : (int)(UI_TEXT_CLIP_MARGIN + 0.5f);
- const float okwidth = (float)max_ii(BLI_rcti_size_x(rect) - border, 0);
- const size_t max_len = sizeof(but->drawstr);
- const float minwidth = (float)(UI_DPI_ICON_SIZE) / but->block->aspect * 2.0f;
-
- but->ofs = 0;
- but->strwidth = UI_text_clip_middle_ex(fstyle, but->drawstr, okwidth, minwidth, max_len, rsep);
+ /* No margin for labels! */
+ const int border = ELEM(but->type, UI_BTYPE_LABEL, UI_BTYPE_MENU, UI_BTYPE_POPOVER) ?
+ 0 :
+ (int)(UI_TEXT_CLIP_MARGIN + 0.5f);
+ const float okwidth = (float)max_ii(BLI_rcti_size_x(rect) - border, 0);
+ const size_t max_len = sizeof(but->drawstr);
+ const float minwidth = (float)(UI_DPI_ICON_SIZE) / but->block->aspect * 2.0f;
+
+ but->ofs = 0;
+ but->strwidth = UI_text_clip_middle_ex(fstyle, but->drawstr, okwidth, minwidth, max_len, rsep);
}
/**
@@ -1667,67 +1778,67 @@ static void ui_text_clip_middle_protect_right(const uiFontStyle *fstyle, uiBut *
*/
static void ui_text_clip_cursor(const uiFontStyle *fstyle, uiBut *but, const rcti *rect)
{
- const int border = (int)(UI_TEXT_CLIP_MARGIN + 0.5f);
- const int okwidth = max_ii(BLI_rcti_size_x(rect) - border, 0);
-
- BLI_assert(but->editstr && but->pos >= 0);
-
- /* need to set this first */
- UI_fontstyle_set(fstyle);
-
- if (fstyle->kerning == 1) {
- /* for BLF_width */
- BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
- }
-
- /* define ofs dynamically */
- if (but->ofs > but->pos) {
- but->ofs = but->pos;
- }
-
- if (BLF_width(fstyle->uifont_id, but->editstr, INT_MAX) <= okwidth) {
- but->ofs = 0;
- }
-
- but->strwidth = BLF_width(fstyle->uifont_id, but->editstr + but->ofs, INT_MAX);
-
- if (but->strwidth > okwidth) {
- int len = strlen(but->editstr);
-
- while (but->strwidth > okwidth) {
- float width;
-
- /* string position of cursor */
- width = BLF_width(fstyle->uifont_id, but->editstr + but->ofs, (but->pos - but->ofs));
-
- /* if cursor is at 20 pixels of right side button we clip left */
- if (width > okwidth - 20) {
- ui_text_clip_give_next_off(but, but->editstr);
- }
- else {
- int bytes;
- /* shift string to the left */
- if (width < 20 && but->ofs > 0) {
- ui_text_clip_give_prev_off(but, but->editstr);
- }
- bytes = BLI_str_utf8_size(BLI_str_find_prev_char_utf8(but->editstr, but->editstr + len));
- if (bytes == -1) {
- bytes = 1;
- }
- len -= bytes;
- }
-
- but->strwidth = BLF_width(fstyle->uifont_id, but->editstr + but->ofs, len - but->ofs);
-
- if (but->strwidth < 10) {
- break;
- }
- }
- }
-
- if (fstyle->kerning == 1) {
- BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
- }
+ const int border = (int)(UI_TEXT_CLIP_MARGIN + 0.5f);
+ const int okwidth = max_ii(BLI_rcti_size_x(rect) - border, 0);
+
+ BLI_assert(but->editstr && but->pos >= 0);
+
+ /* need to set this first */
+ UI_fontstyle_set(fstyle);
+
+ if (fstyle->kerning == 1) {
+ /* for BLF_width */
+ BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
+ }
+
+ /* define ofs dynamically */
+ if (but->ofs > but->pos) {
+ but->ofs = but->pos;
+ }
+
+ if (BLF_width(fstyle->uifont_id, but->editstr, INT_MAX) <= okwidth) {
+ but->ofs = 0;
+ }
+
+ but->strwidth = BLF_width(fstyle->uifont_id, but->editstr + but->ofs, INT_MAX);
+
+ if (but->strwidth > okwidth) {
+ int len = strlen(but->editstr);
+
+ while (but->strwidth > okwidth) {
+ float width;
+
+ /* string position of cursor */
+ width = BLF_width(fstyle->uifont_id, but->editstr + but->ofs, (but->pos - but->ofs));
+
+ /* if cursor is at 20 pixels of right side button we clip left */
+ if (width > okwidth - 20) {
+ ui_text_clip_give_next_off(but, but->editstr);
+ }
+ else {
+ int bytes;
+ /* shift string to the left */
+ if (width < 20 && but->ofs > 0) {
+ ui_text_clip_give_prev_off(but, but->editstr);
+ }
+ bytes = BLI_str_utf8_size(BLI_str_find_prev_char_utf8(but->editstr, but->editstr + len));
+ if (bytes == -1) {
+ bytes = 1;
+ }
+ len -= bytes;
+ }
+
+ but->strwidth = BLF_width(fstyle->uifont_id, but->editstr + but->ofs, len - but->ofs);
+
+ if (but->strwidth < 10) {
+ break;
+ }
+ }
+ }
+
+ if (fstyle->kerning == 1) {
+ BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
+ }
}
/**
@@ -1737,1093 +1848,1123 @@ static void ui_text_clip_cursor(const uiFontStyle *fstyle, uiBut *but, const rct
*/
static void ui_text_clip_right_label(const uiFontStyle *fstyle, uiBut *but, const rcti *rect)
{
- const int border = UI_TEXT_CLIP_MARGIN + 1;
- const int okwidth = max_ii(BLI_rcti_size_x(rect) - border, 0);
- char *cpoin = NULL;
- int drawstr_len = strlen(but->drawstr);
- const char *cpend = but->drawstr + drawstr_len;
-
- /* need to set this first */
- UI_fontstyle_set(fstyle);
-
- if (fstyle->kerning == 1) {
- /* for BLF_width */
- BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
- }
-
- but->strwidth = BLF_width(fstyle->uifont_id, but->drawstr, sizeof(but->drawstr));
- but->ofs = 0;
-
-
- /* First shorten num-buttons eg,
- * Translucency: 0.000
- * becomes
- * Trans: 0.000
- */
-
- /* find the space after ':' separator */
- cpoin = strrchr(but->drawstr, ':');
-
- if (cpoin && (cpoin < cpend - 2)) {
- char *cp2 = cpoin;
-
- /* chop off the leading text, starting from the right */
- while (but->strwidth > okwidth && cp2 > but->drawstr) {
- const char *prev_utf8 = BLI_str_find_prev_char_utf8(but->drawstr, cp2);
- int bytes = cp2 - prev_utf8;
-
- /* shift the text after and including cp2 back by 1 char,
- * +1 to include null terminator */
- memmove(cp2 - bytes, cp2, drawstr_len + 1);
- cp2 -= bytes;
-
- drawstr_len -= bytes;
- // BLI_assert(strlen(but->drawstr) == drawstr_len);
-
- but->strwidth = BLF_width(fstyle->uifont_id, but->drawstr + but->ofs, sizeof(but->drawstr) - but->ofs);
- if (but->strwidth < 10) {
- break;
- }
- }
-
-
- /* after the leading text is gone, chop off the : and following space, with ofs */
- while ((but->strwidth > okwidth) && (but->ofs < 2)) {
- ui_text_clip_give_next_off(but, but->drawstr);
- but->strwidth = BLF_width(fstyle->uifont_id, but->drawstr + but->ofs, sizeof(but->drawstr) - but->ofs);
- if (but->strwidth < 10) {
- break;
- }
- }
- }
-
-
- /* Now just remove trailing chars */
- /* once the label's gone, chop off the least significant digits */
- if (but->strwidth > okwidth) {
- float strwidth;
- drawstr_len = BLF_width_to_strlen(
- fstyle->uifont_id, but->drawstr + but->ofs,
- drawstr_len - but->ofs, okwidth, &strwidth) + but->ofs;
- but->strwidth = strwidth;
- but->drawstr[drawstr_len] = 0;
- }
-
- if (fstyle->kerning == 1) {
- BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
- }
+ const int border = UI_TEXT_CLIP_MARGIN + 1;
+ const int okwidth = max_ii(BLI_rcti_size_x(rect) - border, 0);
+ char *cpoin = NULL;
+ int drawstr_len = strlen(but->drawstr);
+ const char *cpend = but->drawstr + drawstr_len;
+
+ /* need to set this first */
+ UI_fontstyle_set(fstyle);
+
+ if (fstyle->kerning == 1) {
+ /* for BLF_width */
+ BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
+ }
+
+ but->strwidth = BLF_width(fstyle->uifont_id, but->drawstr, sizeof(but->drawstr));
+ but->ofs = 0;
+
+ /* First shorten num-buttons eg,
+ * Translucency: 0.000
+ * becomes
+ * Trans: 0.000
+ */
+
+ /* find the space after ':' separator */
+ cpoin = strrchr(but->drawstr, ':');
+
+ if (cpoin && (cpoin < cpend - 2)) {
+ char *cp2 = cpoin;
+
+ /* chop off the leading text, starting from the right */
+ while (but->strwidth > okwidth && cp2 > but->drawstr) {
+ const char *prev_utf8 = BLI_str_find_prev_char_utf8(but->drawstr, cp2);
+ int bytes = cp2 - prev_utf8;
+
+ /* shift the text after and including cp2 back by 1 char,
+ * +1 to include null terminator */
+ memmove(cp2 - bytes, cp2, drawstr_len + 1);
+ cp2 -= bytes;
+
+ drawstr_len -= bytes;
+ // BLI_assert(strlen(but->drawstr) == drawstr_len);
+
+ but->strwidth = BLF_width(
+ fstyle->uifont_id, but->drawstr + but->ofs, sizeof(but->drawstr) - but->ofs);
+ if (but->strwidth < 10) {
+ break;
+ }
+ }
+
+ /* after the leading text is gone, chop off the : and following space, with ofs */
+ while ((but->strwidth > okwidth) && (but->ofs < 2)) {
+ ui_text_clip_give_next_off(but, but->drawstr);
+ but->strwidth = BLF_width(
+ fstyle->uifont_id, but->drawstr + but->ofs, sizeof(but->drawstr) - but->ofs);
+ if (but->strwidth < 10) {
+ break;
+ }
+ }
+ }
+
+ /* Now just remove trailing chars */
+ /* once the label's gone, chop off the least significant digits */
+ if (but->strwidth > okwidth) {
+ float strwidth;
+ drawstr_len = BLF_width_to_strlen(fstyle->uifont_id,
+ but->drawstr + but->ofs,
+ drawstr_len - but->ofs,
+ okwidth,
+ &strwidth) +
+ but->ofs;
+ but->strwidth = strwidth;
+ but->drawstr[drawstr_len] = 0;
+ }
+
+ if (fstyle->kerning == 1) {
+ BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
+ }
}
#ifdef WITH_INPUT_IME
-static void widget_draw_text_ime_underline(
- uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *but, const rcti *rect,
- const wmIMEData *ime_data, const char *drawstr)
+static void widget_draw_text_ime_underline(uiFontStyle *fstyle,
+ uiWidgetColors *wcol,
+ uiBut *but,
+ const rcti *rect,
+ const wmIMEData *ime_data,
+ const char *drawstr)
{
- int ofs_x, width;
- int rect_x = BLI_rcti_size_x(rect);
- int sel_start = ime_data->sel_start, sel_end = ime_data->sel_end;
- float fcol[4];
-
- if (drawstr[0] != 0) {
- if (but->pos >= but->ofs) {
- ofs_x = BLF_width(fstyle->uifont_id, drawstr + but->ofs, but->pos - but->ofs);
- }
- else {
- ofs_x = 0;
- }
-
- width = BLF_width(
- fstyle->uifont_id, drawstr + but->ofs,
- ime_data->composite_len + but->pos - but->ofs);
-
- rgba_uchar_to_float(fcol, wcol->text);
- UI_draw_text_underline(rect->xmin + ofs_x, rect->ymin + 6 * U.pixelsize, min_ii(width, rect_x - 2) - ofs_x, 1, fcol);
-
- /* draw the thick line */
- if (sel_start != -1 && sel_end != -1) {
- sel_end -= sel_start;
- sel_start += but->pos;
-
- if (sel_start >= but->ofs) {
- ofs_x = BLF_width(fstyle->uifont_id, drawstr + but->ofs, sel_start - but->ofs);
- }
- else {
- ofs_x = 0;
- }
-
- width = BLF_width(
- fstyle->uifont_id, drawstr + but->ofs,
- sel_end + sel_start - but->ofs);
-
- UI_draw_text_underline(rect->xmin + ofs_x, rect->ymin + 6 * U.pixelsize, min_ii(width, rect_x - 2) - ofs_x, 2, fcol);
- }
- }
+ int ofs_x, width;
+ int rect_x = BLI_rcti_size_x(rect);
+ int sel_start = ime_data->sel_start, sel_end = ime_data->sel_end;
+ float fcol[4];
+
+ if (drawstr[0] != 0) {
+ if (but->pos >= but->ofs) {
+ ofs_x = BLF_width(fstyle->uifont_id, drawstr + but->ofs, but->pos - but->ofs);
+ }
+ else {
+ ofs_x = 0;
+ }
+
+ width = BLF_width(
+ fstyle->uifont_id, drawstr + but->ofs, ime_data->composite_len + but->pos - but->ofs);
+
+ rgba_uchar_to_float(fcol, wcol->text);
+ UI_draw_text_underline(rect->xmin + ofs_x,
+ rect->ymin + 6 * U.pixelsize,
+ min_ii(width, rect_x - 2) - ofs_x,
+ 1,
+ fcol);
+
+ /* draw the thick line */
+ if (sel_start != -1 && sel_end != -1) {
+ sel_end -= sel_start;
+ sel_start += but->pos;
+
+ if (sel_start >= but->ofs) {
+ ofs_x = BLF_width(fstyle->uifont_id, drawstr + but->ofs, sel_start - but->ofs);
+ }
+ else {
+ ofs_x = 0;
+ }
+
+ width = BLF_width(fstyle->uifont_id, drawstr + but->ofs, sel_end + sel_start - but->ofs);
+
+ UI_draw_text_underline(rect->xmin + ofs_x,
+ rect->ymin + 6 * U.pixelsize,
+ min_ii(width, rect_x - 2) - ofs_x,
+ 2,
+ fcol);
+ }
+ }
}
-#endif /* WITH_INPUT_IME */
+#endif /* WITH_INPUT_IME */
-static void widget_draw_text(const uiFontStyle *fstyle, const uiWidgetColors *wcol, uiBut *but, rcti *rect)
+static void widget_draw_text(const uiFontStyle *fstyle,
+ const uiWidgetColors *wcol,
+ uiBut *but,
+ rcti *rect)
{
- int drawstr_left_len = UI_MAX_DRAW_STR;
- const char *drawstr = but->drawstr;
- const char *drawstr_right = NULL;
- bool use_right_only = false;
+ int drawstr_left_len = UI_MAX_DRAW_STR;
+ const char *drawstr = but->drawstr;
+ const char *drawstr_right = NULL;
+ bool use_right_only = false;
#ifdef WITH_INPUT_IME
- const wmIMEData *ime_data;
+ const wmIMEData *ime_data;
#endif
- UI_fontstyle_set(fstyle);
-
- eFontStyle_Align align;
- if (but->editstr || (but->drawflag & UI_BUT_TEXT_LEFT)) {
- align = UI_STYLE_TEXT_LEFT;
- }
- else if (but->drawflag & UI_BUT_TEXT_RIGHT) {
- align = UI_STYLE_TEXT_RIGHT;
- }
- else {
- align = UI_STYLE_TEXT_CENTER;
- }
-
- if (fstyle->kerning == 1) {
- /* for BLF_width */
- BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
- }
-
- /* Special case: when we're entering text for multiple buttons,
- * don't draw the text for any of the multi-editing buttons */
- if (UNLIKELY(but->flag & UI_BUT_DRAG_MULTI)) {
- uiBut *but_edit = ui_but_drag_multi_edit_get(but);
- if (but_edit) {
- drawstr = but_edit->editstr;
- align = UI_STYLE_TEXT_LEFT;
- }
- }
- else {
- if (but->editstr) {
- /* max length isn't used in this case,
- * we rely on string being NULL terminated. */
- drawstr_left_len = INT_MAX;
+ UI_fontstyle_set(fstyle);
+
+ eFontStyle_Align align;
+ if (but->editstr || (but->drawflag & UI_BUT_TEXT_LEFT)) {
+ align = UI_STYLE_TEXT_LEFT;
+ }
+ else if (but->drawflag & UI_BUT_TEXT_RIGHT) {
+ align = UI_STYLE_TEXT_RIGHT;
+ }
+ else {
+ align = UI_STYLE_TEXT_CENTER;
+ }
+
+ if (fstyle->kerning == 1) {
+ /* for BLF_width */
+ BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
+ }
+
+ /* Special case: when we're entering text for multiple buttons,
+ * don't draw the text for any of the multi-editing buttons */
+ if (UNLIKELY(but->flag & UI_BUT_DRAG_MULTI)) {
+ uiBut *but_edit = ui_but_drag_multi_edit_get(but);
+ if (but_edit) {
+ drawstr = but_edit->editstr;
+ align = UI_STYLE_TEXT_LEFT;
+ }
+ }
+ else {
+ if (but->editstr) {
+ /* max length isn't used in this case,
+ * we rely on string being NULL terminated. */
+ drawstr_left_len = INT_MAX;
#ifdef WITH_INPUT_IME
- /* FIXME, IME is modifying 'const char *drawstr! */
- ime_data = ui_but_ime_data_get(but);
-
- if (ime_data && ime_data->composite_len) {
- /* insert composite string into cursor pos */
- BLI_snprintf(
- (char *)drawstr, UI_MAX_DRAW_STR, "%s%s%s",
- but->editstr, ime_data->str_composite,
- but->editstr + but->pos);
- }
- else
+ /* FIXME, IME is modifying 'const char *drawstr! */
+ ime_data = ui_but_ime_data_get(but);
+
+ if (ime_data && ime_data->composite_len) {
+ /* insert composite string into cursor pos */
+ BLI_snprintf((char *)drawstr,
+ UI_MAX_DRAW_STR,
+ "%s%s%s",
+ but->editstr,
+ ime_data->str_composite,
+ but->editstr + but->pos);
+ }
+ else
#endif
- {
- drawstr = but->editstr;
- }
- }
- }
-
-
- /* text button selection, cursor, composite underline */
- if (but->editstr && but->pos != -1) {
- int but_pos_ofs;
- int tx, ty;
-
- /* text button selection */
- if ((but->selend - but->selsta) > 0) {
- int selsta_draw, selwidth_draw;
-
- if (drawstr[0] != 0) {
- /* We are drawing on top of widget bases. Flush cache. */
- GPU_blend(true);
- UI_widgetbase_draw_cache_flush();
- GPU_blend(false);
-
- if (but->selsta >= but->ofs) {
- selsta_draw = BLF_width(fstyle->uifont_id, drawstr + but->ofs, but->selsta - but->ofs);
- }
- else {
- selsta_draw = 0;
- }
-
- selwidth_draw = BLF_width(fstyle->uifont_id, drawstr + but->ofs, but->selend - but->ofs);
-
- uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_I32, 2, GPU_FETCH_INT_TO_FLOAT);
- immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
-
- immUniformColor4ubv((uchar *)wcol->item);
- immRecti(pos, rect->xmin + selsta_draw,
- rect->ymin + 2,
- min_ii(rect->xmin + selwidth_draw, rect->xmax - 2),
- rect->ymax - 2);
-
- immUnbindProgram();
- }
- }
-
- /* text cursor */
- but_pos_ofs = but->pos;
+ {
+ drawstr = but->editstr;
+ }
+ }
+ }
+
+ /* text button selection, cursor, composite underline */
+ if (but->editstr && but->pos != -1) {
+ int but_pos_ofs;
+ int tx, ty;
+
+ /* text button selection */
+ if ((but->selend - but->selsta) > 0) {
+ int selsta_draw, selwidth_draw;
+
+ if (drawstr[0] != 0) {
+ /* We are drawing on top of widget bases. Flush cache. */
+ GPU_blend(true);
+ UI_widgetbase_draw_cache_flush();
+ GPU_blend(false);
+
+ if (but->selsta >= but->ofs) {
+ selsta_draw = BLF_width(fstyle->uifont_id, drawstr + but->ofs, but->selsta - but->ofs);
+ }
+ else {
+ selsta_draw = 0;
+ }
+
+ selwidth_draw = BLF_width(fstyle->uifont_id, drawstr + but->ofs, but->selend - but->ofs);
+
+ uint pos = GPU_vertformat_attr_add(
+ immVertexFormat(), "pos", GPU_COMP_I32, 2, GPU_FETCH_INT_TO_FLOAT);
+ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+ immUniformColor4ubv((uchar *)wcol->item);
+ immRecti(pos,
+ rect->xmin + selsta_draw,
+ rect->ymin + 2,
+ min_ii(rect->xmin + selwidth_draw, rect->xmax - 2),
+ rect->ymax - 2);
+
+ immUnbindProgram();
+ }
+ }
+
+ /* text cursor */
+ but_pos_ofs = but->pos;
#ifdef WITH_INPUT_IME
- /* if is ime compositing, move the cursor */
- if (ime_data && ime_data->composite_len && ime_data->cursor_pos != -1) {
- but_pos_ofs += ime_data->cursor_pos;
- }
+ /* if is ime compositing, move the cursor */
+ if (ime_data && ime_data->composite_len && ime_data->cursor_pos != -1) {
+ but_pos_ofs += ime_data->cursor_pos;
+ }
#endif
- if (but->pos >= but->ofs) {
- int t;
- if (drawstr[0] != 0) {
- t = BLF_width(fstyle->uifont_id, drawstr + but->ofs, but_pos_ofs - but->ofs);
- }
- else {
- t = 0;
- }
- /* We are drawing on top of widget bases. Flush cache. */
- GPU_blend(true);
- UI_widgetbase_draw_cache_flush();
- GPU_blend(false);
+ if (but->pos >= but->ofs) {
+ int t;
+ if (drawstr[0] != 0) {
+ t = BLF_width(fstyle->uifont_id, drawstr + but->ofs, but_pos_ofs - but->ofs);
+ }
+ else {
+ t = 0;
+ }
+ /* We are drawing on top of widget bases. Flush cache. */
+ GPU_blend(true);
+ UI_widgetbase_draw_cache_flush();
+ GPU_blend(false);
- uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_I32, 2, GPU_FETCH_INT_TO_FLOAT);
- immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+ uint pos = GPU_vertformat_attr_add(
+ immVertexFormat(), "pos", GPU_COMP_I32, 2, GPU_FETCH_INT_TO_FLOAT);
+ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
- immUniformColor3f(0.2f, 0.6f, 0.9f);
+ immUniformColor3f(0.2f, 0.6f, 0.9f);
- tx = rect->xmin + t + 2;
- ty = rect->ymin + 2;
+ tx = rect->xmin + t + 2;
+ ty = rect->ymin + 2;
- /* draw cursor */
- immRecti(pos, rect->xmin + t, ty, tx, rect->ymax - 2);
+ /* draw cursor */
+ immRecti(pos, rect->xmin + t, ty, tx, rect->ymax - 2);
- immUnbindProgram();
- }
+ immUnbindProgram();
+ }
#ifdef WITH_INPUT_IME
- if (ime_data && ime_data->composite_len) {
- /* ime cursor following */
- if (but->pos >= but->ofs) {
- ui_but_ime_reposition(but, tx + 5, ty + 3, false);
- }
-
- /* composite underline */
- widget_draw_text_ime_underline(fstyle, wcol, but, rect, ime_data, drawstr);
- }
+ if (ime_data && ime_data->composite_len) {
+ /* ime cursor following */
+ if (but->pos >= but->ofs) {
+ ui_but_ime_reposition(but, tx + 5, ty + 3, false);
+ }
+
+ /* composite underline */
+ widget_draw_text_ime_underline(fstyle, wcol, but, rect, ime_data, drawstr);
+ }
#endif
- }
+ }
- if (fstyle->kerning == 1) {
- BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
- }
+ if (fstyle->kerning == 1) {
+ BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
+ }
#if 0
- ui_rasterpos_safe(x, y, but->aspect);
- transopts = ui_translate_buttons();
+ ui_rasterpos_safe(x, y, but->aspect);
+ transopts = ui_translate_buttons();
#endif
- /* cut string in 2 parts - only for menu entries */
- if ((but->drawflag & UI_BUT_HAS_SHORTCUT) &&
- (but->editstr == NULL))
- {
- if (but->flag & UI_BUT_HAS_SEP_CHAR) {
- drawstr_right = strrchr(drawstr, UI_SEP_CHAR);
- if (drawstr_right) {
- drawstr_left_len = (drawstr_right - drawstr);
- drawstr_right++;
- }
- }
- }
+ /* cut string in 2 parts - only for menu entries */
+ if ((but->drawflag & UI_BUT_HAS_SHORTCUT) && (but->editstr == NULL)) {
+ if (but->flag & UI_BUT_HAS_SEP_CHAR) {
+ drawstr_right = strrchr(drawstr, UI_SEP_CHAR);
+ if (drawstr_right) {
+ drawstr_left_len = (drawstr_right - drawstr);
+ drawstr_right++;
+ }
+ }
+ }
#ifdef USE_NUMBUTS_LR_ALIGN
- if (!drawstr_right &&
- (but->drawflag & UI_BUT_TEXT_LEFT) &&
- ELEM(but->type, UI_BTYPE_NUM, UI_BTYPE_NUM_SLIDER) &&
- /* if we're editing or multi-drag (fake editing), then use left alignment */
- (but->editstr == NULL) && (drawstr == but->drawstr))
- {
- drawstr_right = strchr(drawstr + but->ofs, ':');
- if (drawstr_right) {
- drawstr_right++;
- drawstr_left_len = (drawstr_right - drawstr);
-
- while (*drawstr_right == ' ') {
- drawstr_right++;
- }
- }
- else {
- /* no prefix, even so use only cpoin */
- drawstr_right = drawstr + but->ofs;
- use_right_only = true;
- }
- }
+ if (!drawstr_right && (but->drawflag & UI_BUT_TEXT_LEFT) &&
+ ELEM(but->type, UI_BTYPE_NUM, UI_BTYPE_NUM_SLIDER) &&
+ /* if we're editing or multi-drag (fake editing), then use left alignment */
+ (but->editstr == NULL) && (drawstr == but->drawstr)) {
+ drawstr_right = strchr(drawstr + but->ofs, ':');
+ if (drawstr_right) {
+ drawstr_right++;
+ drawstr_left_len = (drawstr_right - drawstr);
+
+ while (*drawstr_right == ' ') {
+ drawstr_right++;
+ }
+ }
+ else {
+ /* no prefix, even so use only cpoin */
+ drawstr_right = drawstr + but->ofs;
+ use_right_only = true;
+ }
+ }
#endif
- if (!use_right_only) {
- /* for underline drawing */
- float font_xofs, font_yofs;
-
- int drawlen = (drawstr_left_len == INT_MAX) ? strlen(drawstr + but->ofs) : (drawstr_left_len - but->ofs);
-
- if (drawlen > 0) {
- UI_fontstyle_draw_ex(
- fstyle, rect, drawstr + but->ofs, (uchar *)wcol->text,
- &(struct uiFontStyleDraw_Params) { .align = align, },
- drawlen, &font_xofs, &font_yofs);
-
- if (but->menu_key != '\0') {
- char fixedbuf[128];
- const char *str;
-
- BLI_strncpy(fixedbuf, drawstr + but->ofs, min_ii(sizeof(fixedbuf), drawlen));
-
- str = strchr(fixedbuf, but->menu_key - 32); /* upper case */
- if (str == NULL) {
- str = strchr(fixedbuf, but->menu_key);
- }
-
- if (str) {
- int ul_index = -1;
- float ul_advance;
-
- ul_index = (int)(str - fixedbuf);
-
- if (fstyle->kerning == 1) {
- BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
- }
-
- fixedbuf[ul_index] = '\0';
- ul_advance = BLF_width(fstyle->uifont_id, fixedbuf, ul_index) + (1.0f * UI_DPI_FAC);
-
- BLF_position(fstyle->uifont_id, rect->xmin + font_xofs + ul_advance, rect->ymin + font_yofs, 0.0f);
- BLF_color4ubv(fstyle->uifont_id, (uchar *)wcol->text);
- BLF_draw(fstyle->uifont_id, "_", 2);
-
- if (fstyle->kerning == 1) {
- BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
- }
- }
- }
- }
- }
-
- /* part text right aligned */
- if (drawstr_right) {
- char col[4];
- copy_v4_v4_char(col, wcol->text);
- if (but->drawflag & UI_BUT_HAS_SHORTCUT) {
- col[3] *= 0.5f;
- }
-
- rect->xmax -= UI_TEXT_CLIP_MARGIN;
- UI_fontstyle_draw(
- fstyle, rect, drawstr_right, (const uchar *)col,
- &(struct uiFontStyleDraw_Params) { .align = UI_STYLE_TEXT_RIGHT, });
- }
+ if (!use_right_only) {
+ /* for underline drawing */
+ float font_xofs, font_yofs;
+
+ int drawlen = (drawstr_left_len == INT_MAX) ? strlen(drawstr + but->ofs) :
+ (drawstr_left_len - but->ofs);
+
+ if (drawlen > 0) {
+ UI_fontstyle_draw_ex(fstyle,
+ rect,
+ drawstr + but->ofs,
+ (uchar *)wcol->text,
+ &(struct uiFontStyleDraw_Params){
+ .align = align,
+ },
+ drawlen,
+ &font_xofs,
+ &font_yofs);
+
+ if (but->menu_key != '\0') {
+ char fixedbuf[128];
+ const char *str;
+
+ BLI_strncpy(fixedbuf, drawstr + but->ofs, min_ii(sizeof(fixedbuf), drawlen));
+
+ str = strchr(fixedbuf, but->menu_key - 32); /* upper case */
+ if (str == NULL) {
+ str = strchr(fixedbuf, but->menu_key);
+ }
+
+ if (str) {
+ int ul_index = -1;
+ float ul_advance;
+
+ ul_index = (int)(str - fixedbuf);
+
+ if (fstyle->kerning == 1) {
+ BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
+ }
+
+ fixedbuf[ul_index] = '\0';
+ ul_advance = BLF_width(fstyle->uifont_id, fixedbuf, ul_index) + (1.0f * UI_DPI_FAC);
+
+ BLF_position(fstyle->uifont_id,
+ rect->xmin + font_xofs + ul_advance,
+ rect->ymin + font_yofs,
+ 0.0f);
+ BLF_color4ubv(fstyle->uifont_id, (uchar *)wcol->text);
+ BLF_draw(fstyle->uifont_id, "_", 2);
+
+ if (fstyle->kerning == 1) {
+ BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
+ }
+ }
+ }
+ }
+ }
+
+ /* part text right aligned */
+ if (drawstr_right) {
+ char col[4];
+ copy_v4_v4_char(col, wcol->text);
+ if (but->drawflag & UI_BUT_HAS_SHORTCUT) {
+ col[3] *= 0.5f;
+ }
+
+ rect->xmax -= UI_TEXT_CLIP_MARGIN;
+ UI_fontstyle_draw(fstyle,
+ rect,
+ drawstr_right,
+ (const uchar *)col,
+ &(struct uiFontStyleDraw_Params){
+ .align = UI_STYLE_TEXT_RIGHT,
+ });
+ }
}
static BIFIconID widget_icon_id(uiBut *but)
{
- if (!(but->flag & UI_HAS_ICON)) {
- return ICON_NONE;
- }
-
- /* Consecutive icons can be toggle between. */
- if (but->drawflag & UI_BUT_ICON_REVERSE) {
- return but->icon - but->iconadd;
- }
- else {
- return but->icon + but->iconadd;
- }
+ if (!(but->flag & UI_HAS_ICON)) {
+ return ICON_NONE;
+ }
+
+ /* Consecutive icons can be toggle between. */
+ if (but->drawflag & UI_BUT_ICON_REVERSE) {
+ return but->icon - but->iconadd;
+ }
+ else {
+ return but->icon + but->iconadd;
+ }
}
/* draws text and icons for buttons */
-static void widget_draw_text_icon(const uiFontStyle *fstyle, const uiWidgetColors *wcol, uiBut *but, rcti *rect)
+static void widget_draw_text_icon(const uiFontStyle *fstyle,
+ const uiWidgetColors *wcol,
+ uiBut *but,
+ rcti *rect)
{
- const uiButExtraIconType extra_icon_type = ui_but_icon_extra_get(but);
- const bool show_menu_icon = ui_but_draw_menu_icon(but);
- float alpha = (float)wcol->text[3] / 255.0f;
- char password_str[UI_MAX_DRAW_STR];
-
- ui_but_text_password_hide(password_str, but, false);
-
- /* check for button text label */
- if (ELEM(but->type, UI_BTYPE_MENU, UI_BTYPE_POPOVER) && (but->flag & UI_BUT_NODE_LINK)) {
- rcti temp = *rect;
- temp.xmin = rect->xmax - BLI_rcti_size_y(rect) - 1;
- widget_draw_icon(but, ICON_LAYER_USED, alpha, &temp, wcol->text);
- rect->xmax = temp.xmin;
- }
-
- /* If there's an icon too (made with uiDefIconTextBut) then draw the icon
- * and offset the text label to accommodate it */
-
- /* Big previews with optional text label below */
- if (but->flag & UI_BUT_ICON_PREVIEW && ui_block_is_menu(but->block)) {
- const BIFIconID icon = widget_icon_id(but);
- int icon_size = BLI_rcti_size_y(rect);
- int text_size = 0;
-
- /* This is a bit britle, but avoids adding an 'UI_BUT_HAS_LABEL' flag to but... */
- if (icon_size > BLI_rcti_size_x(rect)) {
- /* button is not square, it has extra height for label */
- text_size = UI_UNIT_Y;
- icon_size -= text_size;
- }
-
- /* draw icon in rect above the space reserved for the label */
- rect->ymin += text_size;
- GPU_blend(true);
- widget_draw_preview(icon, alpha, rect);
- GPU_blend(false);
-
- /* offset rect to draw label in */
- rect->ymin -= text_size;
- rect->ymax -= icon_size;
-
- /* vertically centering text */
- rect->ymin += UI_UNIT_Y / 2;
- }
- /* Icons on the left with optional text label on the right */
- else if (but->flag & UI_HAS_ICON || show_menu_icon) {
- const bool is_tool = UI_but_is_tool(but);
-
- /* XXX add way to draw icons at a different size!
- * Use small icons for popup. */
+ const uiButExtraIconType extra_icon_type = ui_but_icon_extra_get(but);
+ const bool show_menu_icon = ui_but_draw_menu_icon(but);
+ float alpha = (float)wcol->text[3] / 255.0f;
+ char password_str[UI_MAX_DRAW_STR];
+
+ ui_but_text_password_hide(password_str, but, false);
+
+ /* check for button text label */
+ if (ELEM(but->type, UI_BTYPE_MENU, UI_BTYPE_POPOVER) && (but->flag & UI_BUT_NODE_LINK)) {
+ rcti temp = *rect;
+ temp.xmin = rect->xmax - BLI_rcti_size_y(rect) - 1;
+ widget_draw_icon(but, ICON_LAYER_USED, alpha, &temp, wcol->text);
+ rect->xmax = temp.xmin;
+ }
+
+ /* If there's an icon too (made with uiDefIconTextBut) then draw the icon
+ * and offset the text label to accommodate it */
+
+ /* Big previews with optional text label below */
+ if (but->flag & UI_BUT_ICON_PREVIEW && ui_block_is_menu(but->block)) {
+ const BIFIconID icon = widget_icon_id(but);
+ int icon_size = BLI_rcti_size_y(rect);
+ int text_size = 0;
+
+ /* This is a bit britle, but avoids adding an 'UI_BUT_HAS_LABEL' flag to but... */
+ if (icon_size > BLI_rcti_size_x(rect)) {
+ /* button is not square, it has extra height for label */
+ text_size = UI_UNIT_Y;
+ icon_size -= text_size;
+ }
+
+ /* draw icon in rect above the space reserved for the label */
+ rect->ymin += text_size;
+ GPU_blend(true);
+ widget_draw_preview(icon, alpha, rect);
+ GPU_blend(false);
+
+ /* offset rect to draw label in */
+ rect->ymin -= text_size;
+ rect->ymax -= icon_size;
+
+ /* vertically centering text */
+ rect->ymin += UI_UNIT_Y / 2;
+ }
+ /* Icons on the left with optional text label on the right */
+ else if (but->flag & UI_HAS_ICON || show_menu_icon) {
+ const bool is_tool = UI_but_is_tool(but);
+
+ /* XXX add way to draw icons at a different size!
+ * Use small icons for popup. */
#ifdef USE_UI_TOOLBAR_HACK
- const float aspect_orig = but->block->aspect;
- if (is_tool && (but->block->flag & UI_BLOCK_POPOVER)) {
- but->block->aspect *= 2.0f;
- }
+ const float aspect_orig = but->block->aspect;
+ if (is_tool && (but->block->flag & UI_BLOCK_POPOVER)) {
+ but->block->aspect *= 2.0f;
+ }
#endif
- const BIFIconID icon = widget_icon_id(but);
- int icon_size_init = is_tool ? ICON_DEFAULT_HEIGHT_TOOLBAR : ICON_DEFAULT_HEIGHT;
- const float icon_size = icon_size_init / (but->block->aspect / UI_DPI_FAC);
- const float icon_padding = 2 * UI_DPI_FAC;
+ const BIFIconID icon = widget_icon_id(but);
+ int icon_size_init = is_tool ? ICON_DEFAULT_HEIGHT_TOOLBAR : ICON_DEFAULT_HEIGHT;
+ const float icon_size = icon_size_init / (but->block->aspect / UI_DPI_FAC);
+ const float icon_padding = 2 * UI_DPI_FAC;
#ifdef USE_UI_TOOLBAR_HACK
- if (is_tool) {
- /* pass (even if its a menu toolbar) */
- but->drawflag |= UI_BUT_TEXT_LEFT;
- but->drawflag |= UI_BUT_ICON_LEFT;
- }
+ if (is_tool) {
+ /* pass (even if its a menu toolbar) */
+ but->drawflag |= UI_BUT_TEXT_LEFT;
+ but->drawflag |= UI_BUT_ICON_LEFT;
+ }
#endif
- /* menu item - add some more padding so menus don't feel cramped. it must
- * be part of the button so that this area is still clickable */
- if (is_tool) {
- /* pass (even if its a menu toolbar) */
- }
- else if (ui_block_is_pie_menu(but->block)) {
- if (but->dt == UI_EMBOSS_RADIAL) {
- rect->xmin += 0.3f * U.widget_unit;
- }
- }
- else if (ui_block_is_menu(but->block)) {
- rect->xmin += 0.2f * U.widget_unit;
- }
-
- widget_draw_icon(but, icon, alpha, rect, wcol->text);
- if (show_menu_icon) {
- BLI_assert(but->block->content_hints & UI_BLOCK_CONTAINS_SUBMENU_BUT);
- widget_draw_submenu_tria(but, rect, wcol);
- }
+ /* menu item - add some more padding so menus don't feel cramped. it must
+ * be part of the button so that this area is still clickable */
+ if (is_tool) {
+ /* pass (even if its a menu toolbar) */
+ }
+ else if (ui_block_is_pie_menu(but->block)) {
+ if (but->dt == UI_EMBOSS_RADIAL) {
+ rect->xmin += 0.3f * U.widget_unit;
+ }
+ }
+ else if (ui_block_is_menu(but->block)) {
+ rect->xmin += 0.2f * U.widget_unit;
+ }
+
+ widget_draw_icon(but, icon, alpha, rect, wcol->text);
+ if (show_menu_icon) {
+ BLI_assert(but->block->content_hints & UI_BLOCK_CONTAINS_SUBMENU_BUT);
+ widget_draw_submenu_tria(but, rect, wcol);
+ }
#ifdef USE_UI_TOOLBAR_HACK
- but->block->aspect = aspect_orig;
+ but->block->aspect = aspect_orig;
#endif
- rect->xmin += icon_size + icon_padding;
- }
-
- int text_padding = (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;
- if (but->editstr) {
- rect->xmin += text_padding;
- }
- else if (but->flag & UI_BUT_DRAG_MULTI) {
- bool text_is_edited = ui_but_drag_multi_edit_get(but) != NULL;
- if (text_is_edited) {
- rect->xmin += text_padding;
- }
- }
- else if (but->drawflag & UI_BUT_TEXT_LEFT) {
- rect->xmin += text_padding;
- }
- else if (but->drawflag & UI_BUT_TEXT_RIGHT) {
- rect->xmax -= text_padding;
- }
-
- /* Menu contains sub-menu items with triangle icon on their right. Shortcut
- * strings should be drawn with some padding to the right then. */
- if (ui_block_is_menu(but->block) && (but->block->content_hints & UI_BLOCK_CONTAINS_SUBMENU_BUT)) {
- rect->xmax -= UI_MENU_SUBMENU_PADDING;
- }
-
- /* extra icons, e.g. 'x' icon to clear text or icon for eyedropper */
- if (extra_icon_type != UI_BUT_ICONEXTRA_NONE) {
- rcti temp = *rect;
-
- temp.xmin = temp.xmax - (BLI_rcti_size_y(rect) * 1.08f);
-
- if (extra_icon_type == UI_BUT_ICONEXTRA_CLEAR) {
- widget_draw_icon(but, ICON_PANEL_CLOSE, alpha, &temp, wcol->text);
- }
- else if (extra_icon_type == UI_BUT_ICONEXTRA_EYEDROPPER) {
- widget_draw_icon(but, ICON_EYEDROPPER, alpha, &temp, wcol->text);
- }
- else {
- BLI_assert(0);
- }
-
- rect->xmax -= ICON_SIZE_FROM_BUTRECT(rect);
- }
-
- /* clip but->drawstr to fit in available space */
- if (but->editstr && but->pos >= 0) {
- ui_text_clip_cursor(fstyle, but, rect);
- }
- else if (but->drawstr[0] == '\0') {
- /* bypass text clipping on icon buttons */
- but->ofs = 0;
- but->strwidth = 0;
- }
- else if (ELEM(but->type, UI_BTYPE_NUM, UI_BTYPE_NUM_SLIDER)) {
- ui_text_clip_right_label(fstyle, but, rect);
- }
- else if (but->flag & UI_BUT_HAS_SEP_CHAR) {
- /* Clip middle, but protect in all case right part containing the shortcut, if any. */
- ui_text_clip_middle_protect_right(fstyle, but, rect, UI_SEP_CHAR);
- }
- else {
- ui_text_clip_middle(fstyle, but, rect);
- }
-
- /* always draw text for textbutton cursor */
- widget_draw_text(fstyle, wcol, but, rect);
-
- ui_but_text_password_hide(password_str, but, true);
-
- /* if a widget uses font shadow it has to be deactivated now */
- BLF_disable(fstyle->uifont_id, BLF_SHADOW);
+ rect->xmin += icon_size + icon_padding;
+ }
+
+ int text_padding = (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;
+ if (but->editstr) {
+ rect->xmin += text_padding;
+ }
+ else if (but->flag & UI_BUT_DRAG_MULTI) {
+ bool text_is_edited = ui_but_drag_multi_edit_get(but) != NULL;
+ if (text_is_edited) {
+ rect->xmin += text_padding;
+ }
+ }
+ else if (but->drawflag & UI_BUT_TEXT_LEFT) {
+ rect->xmin += text_padding;
+ }
+ else if (but->drawflag & UI_BUT_TEXT_RIGHT) {
+ rect->xmax -= text_padding;
+ }
+
+ /* Menu contains sub-menu items with triangle icon on their right. Shortcut
+ * strings should be drawn with some padding to the right then. */
+ if (ui_block_is_menu(but->block) &&
+ (but->block->content_hints & UI_BLOCK_CONTAINS_SUBMENU_BUT)) {
+ rect->xmax -= UI_MENU_SUBMENU_PADDING;
+ }
+
+ /* extra icons, e.g. 'x' icon to clear text or icon for eyedropper */
+ if (extra_icon_type != UI_BUT_ICONEXTRA_NONE) {
+ rcti temp = *rect;
+
+ temp.xmin = temp.xmax - (BLI_rcti_size_y(rect) * 1.08f);
+
+ if (extra_icon_type == UI_BUT_ICONEXTRA_CLEAR) {
+ widget_draw_icon(but, ICON_PANEL_CLOSE, alpha, &temp, wcol->text);
+ }
+ else if (extra_icon_type == UI_BUT_ICONEXTRA_EYEDROPPER) {
+ widget_draw_icon(but, ICON_EYEDROPPER, alpha, &temp, wcol->text);
+ }
+ else {
+ BLI_assert(0);
+ }
+
+ rect->xmax -= ICON_SIZE_FROM_BUTRECT(rect);
+ }
+
+ /* clip but->drawstr to fit in available space */
+ if (but->editstr && but->pos >= 0) {
+ ui_text_clip_cursor(fstyle, but, rect);
+ }
+ else if (but->drawstr[0] == '\0') {
+ /* bypass text clipping on icon buttons */
+ but->ofs = 0;
+ but->strwidth = 0;
+ }
+ else if (ELEM(but->type, UI_BTYPE_NUM, UI_BTYPE_NUM_SLIDER)) {
+ ui_text_clip_right_label(fstyle, but, rect);
+ }
+ else if (but->flag & UI_BUT_HAS_SEP_CHAR) {
+ /* Clip middle, but protect in all case right part containing the shortcut, if any. */
+ ui_text_clip_middle_protect_right(fstyle, but, rect, UI_SEP_CHAR);
+ }
+ else {
+ ui_text_clip_middle(fstyle, but, rect);
+ }
+
+ /* always draw text for textbutton cursor */
+ widget_draw_text(fstyle, wcol, but, rect);
+
+ ui_but_text_password_hide(password_str, but, true);
+
+ /* if a widget uses font shadow it has to be deactivated now */
+ BLF_disable(fstyle->uifont_id, BLF_SHADOW);
}
#undef UI_TEXT_CLIP_MARGIN
-
/* *********************** widget types ************************************* */
/* ************ button callbacks, state ***************** */
static void widget_state_blend(char cp[3], const char cpstate[3], const float fac)
{
- if (fac != 0.0f) {
- cp[0] = (int)((1.0f - fac) * cp[0] + fac * cpstate[0]);
- cp[1] = (int)((1.0f - fac) * cp[1] + fac * cpstate[1]);
- cp[2] = (int)((1.0f - fac) * cp[2] + fac * cpstate[2]);
- }
+ if (fac != 0.0f) {
+ cp[0] = (int)((1.0f - fac) * cp[0] + fac * cpstate[0]);
+ cp[1] = (int)((1.0f - fac) * cp[1] + fac * cpstate[1]);
+ cp[2] = (int)((1.0f - fac) * cp[2] + fac * cpstate[2]);
+ }
}
/* put all widget colors on half alpha, use local storage */
static void ui_widget_color_disabled(uiWidgetType *wt)
{
- static uiWidgetColors wcol_theme_s;
+ static uiWidgetColors wcol_theme_s;
- wcol_theme_s = *wt->wcol_theme;
+ wcol_theme_s = *wt->wcol_theme;
- wcol_theme_s.outline[3] *= 0.5;
- wcol_theme_s.inner[3] *= 0.5;
- wcol_theme_s.inner_sel[3] *= 0.5;
- wcol_theme_s.item[3] *= 0.5;
- wcol_theme_s.text[3] *= 0.5;
- wcol_theme_s.text_sel[3] *= 0.5;
+ wcol_theme_s.outline[3] *= 0.5;
+ wcol_theme_s.inner[3] *= 0.5;
+ wcol_theme_s.inner_sel[3] *= 0.5;
+ wcol_theme_s.item[3] *= 0.5;
+ wcol_theme_s.text[3] *= 0.5;
+ wcol_theme_s.text_sel[3] *= 0.5;
- wt->wcol_theme = &wcol_theme_s;
+ wt->wcol_theme = &wcol_theme_s;
}
static void widget_active_color(char cp[3])
{
- cp[0] = cp[0] >= 240 ? 255 : cp[0] + 15;
- cp[1] = cp[1] >= 240 ? 255 : cp[1] + 15;
- cp[2] = cp[2] >= 240 ? 255 : cp[2] + 15;
+ cp[0] = cp[0] >= 240 ? 255 : cp[0] + 15;
+ cp[1] = cp[1] >= 240 ? 255 : cp[1] + 15;
+ cp[2] = cp[2] >= 240 ? 255 : cp[2] + 15;
}
/* copy colors from theme, and set changes in it based on state */
static void widget_state(uiWidgetType *wt, int state, int drawflag)
{
- uiWidgetStateColors *wcol_state = wt->wcol_state;
-
- if ((state & UI_BUT_LIST_ITEM) && !(state & UI_STATE_TEXT_INPUT)) {
- /* Override default widget's colors. */
- bTheme *btheme = UI_GetTheme();
- wt->wcol_theme = &btheme->tui.wcol_list_item;
-
- if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE)) {
- ui_widget_color_disabled(wt);
- }
- }
-
- wt->wcol = *(wt->wcol_theme);
-
- if (state & UI_SELECT) {
- copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
- if (drawflag & UI_BUT_ANIMATED_CHANGED) {
- widget_state_blend(wt->wcol.inner, wcol_state->inner_changed_sel, wcol_state->blend);
- }
- else if (state & UI_BUT_ANIMATED_KEY) {
- widget_state_blend(wt->wcol.inner, wcol_state->inner_key_sel, wcol_state->blend);
- }
- else if (state & UI_BUT_ANIMATED) {
- widget_state_blend(wt->wcol.inner, wcol_state->inner_anim_sel, wcol_state->blend);
- }
- else if (state & UI_BUT_DRIVEN) {
- widget_state_blend(wt->wcol.inner, wcol_state->inner_driven_sel, wcol_state->blend);
- }
- else if (state & UI_BUT_OVERRIDEN) {
- widget_state_blend(wt->wcol.inner, wcol_state->inner_overridden_sel, wcol_state->blend);
- }
-
- copy_v3_v3_char(wt->wcol.text, wt->wcol.text_sel);
-
- if (state & UI_SELECT) {
- SWAP(short, wt->wcol.shadetop, wt->wcol.shadedown);
- }
- }
- else {
- if (drawflag & UI_BUT_ANIMATED_CHANGED) {
- widget_state_blend(wt->wcol.inner, wcol_state->inner_changed, wcol_state->blend);
- }
- else if (state & UI_BUT_ANIMATED_KEY) {
- widget_state_blend(wt->wcol.inner, wcol_state->inner_key, wcol_state->blend);
- }
- else if (state & UI_BUT_ANIMATED) {
- widget_state_blend(wt->wcol.inner, wcol_state->inner_anim, wcol_state->blend);
- }
- else if (state & UI_BUT_DRIVEN) {
- widget_state_blend(wt->wcol.inner, wcol_state->inner_driven, wcol_state->blend);
- }
- else if (state & UI_BUT_OVERRIDEN) {
- widget_state_blend(wt->wcol.inner, wcol_state->inner_overridden, wcol_state->blend);
- }
-
- if (state & UI_ACTIVE) { /* mouse over? */
- widget_active_color(wt->wcol.inner);
- }
- }
-
- if (state & UI_BUT_REDALERT) {
- char red[4] = {255, 0, 0};
- if (wt->draw) {
- widget_state_blend(wt->wcol.inner, red, 0.4f);
- }
- else {
- widget_state_blend(wt->wcol.text, red, 0.4f);
- }
- }
-
- if (state & UI_BUT_DRAG_MULTI) {
- /* the button isn't SELECT but we're editing this so draw with sel color */
- copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
- SWAP(short, wt->wcol.shadetop, wt->wcol.shadedown);
- widget_state_blend(wt->wcol.text, wt->wcol.text_sel, 0.85f);
- }
-
- if (state & UI_BUT_NODE_ACTIVE) {
- char blue[4] = {86, 128, 194};
- widget_state_blend(wt->wcol.inner, blue, 0.3f);
- }
+ uiWidgetStateColors *wcol_state = wt->wcol_state;
+
+ if ((state & UI_BUT_LIST_ITEM) && !(state & UI_STATE_TEXT_INPUT)) {
+ /* Override default widget's colors. */
+ bTheme *btheme = UI_GetTheme();
+ wt->wcol_theme = &btheme->tui.wcol_list_item;
+
+ if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE)) {
+ ui_widget_color_disabled(wt);
+ }
+ }
+
+ wt->wcol = *(wt->wcol_theme);
+
+ if (state & UI_SELECT) {
+ copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
+ if (drawflag & UI_BUT_ANIMATED_CHANGED) {
+ widget_state_blend(wt->wcol.inner, wcol_state->inner_changed_sel, wcol_state->blend);
+ }
+ else if (state & UI_BUT_ANIMATED_KEY) {
+ widget_state_blend(wt->wcol.inner, wcol_state->inner_key_sel, wcol_state->blend);
+ }
+ else if (state & UI_BUT_ANIMATED) {
+ widget_state_blend(wt->wcol.inner, wcol_state->inner_anim_sel, wcol_state->blend);
+ }
+ else if (state & UI_BUT_DRIVEN) {
+ widget_state_blend(wt->wcol.inner, wcol_state->inner_driven_sel, wcol_state->blend);
+ }
+ else if (state & UI_BUT_OVERRIDEN) {
+ widget_state_blend(wt->wcol.inner, wcol_state->inner_overridden_sel, wcol_state->blend);
+ }
+
+ copy_v3_v3_char(wt->wcol.text, wt->wcol.text_sel);
+
+ if (state & UI_SELECT) {
+ SWAP(short, wt->wcol.shadetop, wt->wcol.shadedown);
+ }
+ }
+ else {
+ if (drawflag & UI_BUT_ANIMATED_CHANGED) {
+ widget_state_blend(wt->wcol.inner, wcol_state->inner_changed, wcol_state->blend);
+ }
+ else if (state & UI_BUT_ANIMATED_KEY) {
+ widget_state_blend(wt->wcol.inner, wcol_state->inner_key, wcol_state->blend);
+ }
+ else if (state & UI_BUT_ANIMATED) {
+ widget_state_blend(wt->wcol.inner, wcol_state->inner_anim, wcol_state->blend);
+ }
+ else if (state & UI_BUT_DRIVEN) {
+ widget_state_blend(wt->wcol.inner, wcol_state->inner_driven, wcol_state->blend);
+ }
+ else if (state & UI_BUT_OVERRIDEN) {
+ widget_state_blend(wt->wcol.inner, wcol_state->inner_overridden, wcol_state->blend);
+ }
+
+ if (state & UI_ACTIVE) { /* mouse over? */
+ widget_active_color(wt->wcol.inner);
+ }
+ }
+
+ if (state & UI_BUT_REDALERT) {
+ char red[4] = {255, 0, 0};
+ if (wt->draw) {
+ widget_state_blend(wt->wcol.inner, red, 0.4f);
+ }
+ else {
+ widget_state_blend(wt->wcol.text, red, 0.4f);
+ }
+ }
+
+ if (state & UI_BUT_DRAG_MULTI) {
+ /* the button isn't SELECT but we're editing this so draw with sel color */
+ copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
+ SWAP(short, wt->wcol.shadetop, wt->wcol.shadedown);
+ widget_state_blend(wt->wcol.text, wt->wcol.text_sel, 0.85f);
+ }
+
+ if (state & UI_BUT_NODE_ACTIVE) {
+ char blue[4] = {86, 128, 194};
+ widget_state_blend(wt->wcol.inner, blue, 0.3f);
+ }
}
/* sliders use special hack which sets 'item' as inner when drawing filling */
static void widget_state_numslider(uiWidgetType *wt, int state, int drawflag)
{
- uiWidgetStateColors *wcol_state = wt->wcol_state;
- /* XXX special tweak to make sure that bar will still be visible */
- float blend = wcol_state->blend - 0.2f;
-
- /* call this for option button */
- widget_state(wt, state, drawflag);
-
- /* now, set the inner-part so that it reflects state settings too */
- /* TODO: maybe we should have separate settings for the blending colors used for this case? */
- if (state & UI_SELECT) {
-
- if (drawflag & UI_BUT_ANIMATED_CHANGED) {
- widget_state_blend(wt->wcol.item, wcol_state->inner_changed_sel, blend);
- }
- else if (state & UI_BUT_ANIMATED_KEY) {
- widget_state_blend(wt->wcol.item, wcol_state->inner_key_sel, blend);
- }
- else if (state & UI_BUT_ANIMATED) {
- widget_state_blend(wt->wcol.item, wcol_state->inner_anim_sel, blend);
- }
- else if (state & UI_BUT_DRIVEN) {
- widget_state_blend(wt->wcol.item, wcol_state->inner_driven_sel, blend);
- }
- else if (state & UI_BUT_OVERRIDEN) {
- widget_state_blend(wt->wcol.item, wcol_state->inner_overridden_sel, blend);
- }
-
- if (state & UI_SELECT) {
- SWAP(short, wt->wcol.shadetop, wt->wcol.shadedown);
- }
- }
- else {
- if (drawflag & UI_BUT_ANIMATED_CHANGED) {
- widget_state_blend(wt->wcol.item, wcol_state->inner_changed, blend);
- }
- else if (state & UI_BUT_ANIMATED_KEY) {
- widget_state_blend(wt->wcol.item, wcol_state->inner_key, blend);
- }
- else if (state & UI_BUT_ANIMATED) {
- widget_state_blend(wt->wcol.item, wcol_state->inner_anim, blend);
- }
- else if (state & UI_BUT_DRIVEN) {
- widget_state_blend(wt->wcol.item, wcol_state->inner_driven, blend);
- }
- else if (state & UI_BUT_OVERRIDEN) {
- widget_state_blend(wt->wcol.item, wcol_state->inner_overridden, blend);
- }
- }
+ uiWidgetStateColors *wcol_state = wt->wcol_state;
+ /* XXX special tweak to make sure that bar will still be visible */
+ float blend = wcol_state->blend - 0.2f;
+
+ /* call this for option button */
+ widget_state(wt, state, drawflag);
+
+ /* now, set the inner-part so that it reflects state settings too */
+ /* TODO: maybe we should have separate settings for the blending colors used for this case? */
+ if (state & UI_SELECT) {
+
+ if (drawflag & UI_BUT_ANIMATED_CHANGED) {
+ widget_state_blend(wt->wcol.item, wcol_state->inner_changed_sel, blend);
+ }
+ else if (state & UI_BUT_ANIMATED_KEY) {
+ widget_state_blend(wt->wcol.item, wcol_state->inner_key_sel, blend);
+ }
+ else if (state & UI_BUT_ANIMATED) {
+ widget_state_blend(wt->wcol.item, wcol_state->inner_anim_sel, blend);
+ }
+ else if (state & UI_BUT_DRIVEN) {
+ widget_state_blend(wt->wcol.item, wcol_state->inner_driven_sel, blend);
+ }
+ else if (state & UI_BUT_OVERRIDEN) {
+ widget_state_blend(wt->wcol.item, wcol_state->inner_overridden_sel, blend);
+ }
+
+ if (state & UI_SELECT) {
+ SWAP(short, wt->wcol.shadetop, wt->wcol.shadedown);
+ }
+ }
+ else {
+ if (drawflag & UI_BUT_ANIMATED_CHANGED) {
+ widget_state_blend(wt->wcol.item, wcol_state->inner_changed, blend);
+ }
+ else if (state & UI_BUT_ANIMATED_KEY) {
+ widget_state_blend(wt->wcol.item, wcol_state->inner_key, blend);
+ }
+ else if (state & UI_BUT_ANIMATED) {
+ widget_state_blend(wt->wcol.item, wcol_state->inner_anim, blend);
+ }
+ else if (state & UI_BUT_DRIVEN) {
+ widget_state_blend(wt->wcol.item, wcol_state->inner_driven, blend);
+ }
+ else if (state & UI_BUT_OVERRIDEN) {
+ widget_state_blend(wt->wcol.item, wcol_state->inner_overridden, blend);
+ }
+ }
}
/* labels use theme colors for text */
static void widget_state_option_menu(uiWidgetType *wt, int state, int drawflag)
{
- bTheme *btheme = UI_GetTheme(); /* XXX */
-
- /* call this for option button */
- widget_state(wt, state, drawflag);
-
- /* if not selected we get theme from menu back */
- if (state & UI_SELECT) {
- copy_v3_v3_char(wt->wcol.text, btheme->tui.wcol_menu_back.text_sel);
- }
- else {
- copy_v3_v3_char(wt->wcol.text, btheme->tui.wcol_menu_back.text);
- }
+ bTheme *btheme = UI_GetTheme(); /* XXX */
+
+ /* call this for option button */
+ widget_state(wt, state, drawflag);
+
+ /* if not selected we get theme from menu back */
+ if (state & UI_SELECT) {
+ copy_v3_v3_char(wt->wcol.text, btheme->tui.wcol_menu_back.text_sel);
+ }
+ else {
+ copy_v3_v3_char(wt->wcol.text, btheme->tui.wcol_menu_back.text);
+ }
}
-
static void widget_state_nothing(uiWidgetType *wt, int UNUSED(state), int UNUSED(drawflag))
{
- wt->wcol = *(wt->wcol_theme);
+ wt->wcol = *(wt->wcol_theme);
}
/* special case, button that calls pulldown */
static void widget_state_pulldown(uiWidgetType *wt, int UNUSED(state), int UNUSED(drawflag))
{
- wt->wcol = *(wt->wcol_theme);
+ wt->wcol = *(wt->wcol_theme);
}
/* special case, pie menu items */
static void widget_state_pie_menu_item(uiWidgetType *wt, int state, int UNUSED(drawflag))
{
- wt->wcol = *(wt->wcol_theme);
-
- /* active and disabled (not so common) */
- if ((state & UI_BUT_DISABLED) && (state & UI_ACTIVE)) {
- widget_state_blend(wt->wcol.text, wt->wcol.text_sel, 0.5f);
- /* draw the backdrop at low alpha, helps navigating with keys
- * when disabled items are active */
- copy_v4_v4_char(wt->wcol.inner, wt->wcol.item);
- wt->wcol.inner[3] = 64;
- }
- else {
- /* regular active */
- if (state & (UI_SELECT | UI_ACTIVE)) {
- copy_v3_v3_char(wt->wcol.text, wt->wcol.text_sel);
- }
- else if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE)) {
- /* regular disabled */
- widget_state_blend(wt->wcol.text, wt->wcol.inner, 0.5f);
- }
-
- if (state & UI_SELECT) {
- copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
- }
- else if (state & UI_ACTIVE) {
- copy_v4_v4_char(wt->wcol.inner, wt->wcol.item);
- }
- }
+ wt->wcol = *(wt->wcol_theme);
+
+ /* active and disabled (not so common) */
+ if ((state & UI_BUT_DISABLED) && (state & UI_ACTIVE)) {
+ widget_state_blend(wt->wcol.text, wt->wcol.text_sel, 0.5f);
+ /* draw the backdrop at low alpha, helps navigating with keys
+ * when disabled items are active */
+ copy_v4_v4_char(wt->wcol.inner, wt->wcol.item);
+ wt->wcol.inner[3] = 64;
+ }
+ else {
+ /* regular active */
+ if (state & (UI_SELECT | UI_ACTIVE)) {
+ copy_v3_v3_char(wt->wcol.text, wt->wcol.text_sel);
+ }
+ else if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE)) {
+ /* regular disabled */
+ widget_state_blend(wt->wcol.text, wt->wcol.inner, 0.5f);
+ }
+
+ if (state & UI_SELECT) {
+ copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
+ }
+ else if (state & UI_ACTIVE) {
+ copy_v4_v4_char(wt->wcol.inner, wt->wcol.item);
+ }
+ }
}
/* special case, menu items */
static void widget_state_menu_item(uiWidgetType *wt, int state, int UNUSED(drawflag))
{
- wt->wcol = *(wt->wcol_theme);
-
- /* active and disabled (not so common) */
- if ((state & UI_BUT_DISABLED) && (state & UI_ACTIVE)) {
- widget_state_blend(wt->wcol.text, wt->wcol.text_sel, 0.5f);
- /* draw the backdrop at low alpha, helps navigating with keys
- * when disabled items are active */
- copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
- wt->wcol.inner[3] = 64;
- }
- else {
- /* regular active */
- if (state & UI_ACTIVE) {
- copy_v3_v3_char(wt->wcol.text, wt->wcol.text_sel);
- }
- else if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE)) {
- /* regular disabled */
- widget_state_blend(wt->wcol.text, wt->wcol.inner, 0.5f);
- }
-
- if (state & UI_ACTIVE) {
- copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
- }
- }
+ wt->wcol = *(wt->wcol_theme);
+
+ /* active and disabled (not so common) */
+ if ((state & UI_BUT_DISABLED) && (state & UI_ACTIVE)) {
+ widget_state_blend(wt->wcol.text, wt->wcol.text_sel, 0.5f);
+ /* draw the backdrop at low alpha, helps navigating with keys
+ * when disabled items are active */
+ copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
+ wt->wcol.inner[3] = 64;
+ }
+ else {
+ /* regular active */
+ if (state & UI_ACTIVE) {
+ copy_v3_v3_char(wt->wcol.text, wt->wcol.text_sel);
+ }
+ else if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE)) {
+ /* regular disabled */
+ widget_state_blend(wt->wcol.text, wt->wcol.inner, 0.5f);
+ }
+
+ if (state & UI_ACTIVE) {
+ copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
+ }
+ }
}
-
/* ************ menu backdrop ************************* */
/* outside of rect, rad to left/bottom/right */
static void widget_softshadow(const rcti *rect, int roundboxalign, const float radin)
{
- bTheme *btheme = UI_GetTheme();
- uiWidgetBase wtb;
- rcti rect1 = *rect;
- float alphastep;
- int step, totvert;
- float triangle_strip[WIDGET_SIZE_MAX * 2 + 2][2];
- const float radout = UI_ThemeMenuShadowWidth();
+ bTheme *btheme = UI_GetTheme();
+ uiWidgetBase wtb;
+ rcti rect1 = *rect;
+ float alphastep;
+ int step, totvert;
+ float triangle_strip[WIDGET_SIZE_MAX * 2 + 2][2];
+ const float radout = UI_ThemeMenuShadowWidth();
- /* disabled shadow */
- if (radout == 0.0f) {
- return;
- }
+ /* disabled shadow */
+ if (radout == 0.0f) {
+ return;
+ }
- /* prevent tooltips to not show round shadow */
- if (radout > 0.2f * BLI_rcti_size_y(&rect1)) {
- rect1.ymax -= 0.2f * BLI_rcti_size_y(&rect1);
- }
- else {
- rect1.ymax -= radout;
- }
+ /* prevent tooltips to not show round shadow */
+ if (radout > 0.2f * BLI_rcti_size_y(&rect1)) {
+ rect1.ymax -= 0.2f * BLI_rcti_size_y(&rect1);
+ }
+ else {
+ rect1.ymax -= radout;
+ }
- /* inner part */
- totvert = round_box_shadow_edges(wtb.inner_v, &rect1, radin, roundboxalign & (UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT), 0.0f);
+ /* inner part */
+ totvert = round_box_shadow_edges(wtb.inner_v,
+ &rect1,
+ radin,
+ roundboxalign & (UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT),
+ 0.0f);
- /* we draw a number of increasing size alpha quad strips */
- alphastep = 3.0f * btheme->tui.menu_shadow_fac / radout;
+ /* we draw a number of increasing size alpha quad strips */
+ alphastep = 3.0f * btheme->tui.menu_shadow_fac / radout;
- uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+ uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
- immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
- for (step = 1; step <= (int)radout; step++) {
- float expfac = sqrtf(step / radout);
+ for (step = 1; step <= (int)radout; step++) {
+ float expfac = sqrtf(step / radout);
- round_box_shadow_edges(wtb.outer_v, &rect1, radin, UI_CNR_ALL, (float)step);
+ round_box_shadow_edges(wtb.outer_v, &rect1, radin, UI_CNR_ALL, (float)step);
- immUniformColor4f(0.0f, 0.0f, 0.0f, alphastep * (1.0f - expfac));
+ immUniformColor4f(0.0f, 0.0f, 0.0f, alphastep * (1.0f - expfac));
- widget_verts_to_triangle_strip(&wtb, totvert, triangle_strip);
+ widget_verts_to_triangle_strip(&wtb, totvert, triangle_strip);
- widget_draw_vertex_buffer(pos, 0, GL_TRIANGLE_STRIP, triangle_strip, NULL, totvert * 2);
- }
+ widget_draw_vertex_buffer(pos, 0, GL_TRIANGLE_STRIP, triangle_strip, NULL, totvert * 2);
+ }
- immUnbindProgram();
+ immUnbindProgram();
}
static void widget_menu_back(uiWidgetColors *wcol, rcti *rect, int flag, int direction)
{
- uiWidgetBase wtb;
- int roundboxalign = UI_CNR_ALL;
-
- widget_init(&wtb);
-
- /* menu is 2nd level or deeper */
- if (flag & UI_BLOCK_POPUP) {
- //rect->ymin -= 4.0;
- //rect->ymax += 4.0;
- }
- else if (direction == UI_DIR_DOWN) {
- roundboxalign = (UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT);
- rect->ymin -= 0.1f * U.widget_unit;
- }
- else if (direction == UI_DIR_UP) {
- roundboxalign = UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT;
- rect->ymax += 0.1f * U.widget_unit;
- }
-
- GPU_blend_set_func_separate(GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
- GPU_blend(true);
- widget_softshadow(rect, roundboxalign, wcol->roundness * U.widget_unit);
-
- round_box_edges(&wtb, roundboxalign, rect, wcol->roundness * U.widget_unit);
- wtb.draw_emboss = false;
- widgetbase_draw(&wtb, wcol);
-
- GPU_blend(false);
+ uiWidgetBase wtb;
+ int roundboxalign = UI_CNR_ALL;
+
+ widget_init(&wtb);
+
+ /* menu is 2nd level or deeper */
+ if (flag & UI_BLOCK_POPUP) {
+ //rect->ymin -= 4.0;
+ //rect->ymax += 4.0;
+ }
+ else if (direction == UI_DIR_DOWN) {
+ roundboxalign = (UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT);
+ rect->ymin -= 0.1f * U.widget_unit;
+ }
+ else if (direction == UI_DIR_UP) {
+ roundboxalign = UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT;
+ rect->ymax += 0.1f * U.widget_unit;
+ }
+
+ GPU_blend_set_func_separate(
+ GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
+ GPU_blend(true);
+ widget_softshadow(rect, roundboxalign, wcol->roundness * U.widget_unit);
+
+ round_box_edges(&wtb, roundboxalign, rect, wcol->roundness * U.widget_unit);
+ wtb.draw_emboss = false;
+ widgetbase_draw(&wtb, wcol);
+
+ GPU_blend(false);
}
static void ui_hsv_cursor(float x, float y)
{
- uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+ uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
- immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
- immUniformColor3f(1.0f, 1.0f, 1.0f);
- imm_draw_circle_fill_2d(pos, x, y, 3.0f * U.pixelsize, 8);
+ immUniformColor3f(1.0f, 1.0f, 1.0f);
+ imm_draw_circle_fill_2d(pos, x, y, 3.0f * U.pixelsize, 8);
- GPU_blend(true);
- GPU_line_smooth(true);
- immUniformColor3f(0.0f, 0.0f, 0.0f);
- imm_draw_circle_wire_2d(pos, x, y, 3.0f * U.pixelsize, 12);
- GPU_blend(false);
- GPU_line_smooth(false);
+ GPU_blend(true);
+ GPU_line_smooth(true);
+ immUniformColor3f(0.0f, 0.0f, 0.0f);
+ imm_draw_circle_wire_2d(pos, x, y, 3.0f * U.pixelsize, 12);
+ GPU_blend(false);
+ GPU_line_smooth(false);
- immUnbindProgram();
+ immUnbindProgram();
}
void ui_hsvcircle_vals_from_pos(
- const rcti *rect, const float mx, const float my,
- float *r_val_rad, float *r_val_dist)
+ const rcti *rect, const float mx, const float my, float *r_val_rad, float *r_val_dist)
{
- /* duplication of code... well, simple is better now */
- const float centx = BLI_rcti_cent_x_fl(rect);
- const float centy = BLI_rcti_cent_y_fl(rect);
- const float radius = (float)min_ii(BLI_rcti_size_x(rect), BLI_rcti_size_y(rect)) / 2.0f;
- const float m_delta[2] = {mx - centx, my - centy};
- const float dist_sq = len_squared_v2(m_delta);
-
- *r_val_dist = (dist_sq < (radius * radius)) ? sqrtf(dist_sq) / radius : 1.0f;
- *r_val_rad = atan2f(m_delta[0], m_delta[1]) / (2.0f * (float)M_PI) + 0.5f;
+ /* duplication of code... well, simple is better now */
+ const float centx = BLI_rcti_cent_x_fl(rect);
+ const float centy = BLI_rcti_cent_y_fl(rect);
+ const float radius = (float)min_ii(BLI_rcti_size_x(rect), BLI_rcti_size_y(rect)) / 2.0f;
+ const float m_delta[2] = {mx - centx, my - centy};
+ const float dist_sq = len_squared_v2(m_delta);
+
+ *r_val_dist = (dist_sq < (radius * radius)) ? sqrtf(dist_sq) / radius : 1.0f;
+ *r_val_rad = atan2f(m_delta[0], m_delta[1]) / (2.0f * (float)M_PI) + 0.5f;
}
/* cursor in hsv circle, in float units -1 to 1, to map on radius */
void ui_hsvcircle_pos_from_vals(
- const ColorPicker *cpicker, const rcti *rect, const float *hsv,
- float *r_xpos, float *r_ypos)
+ const ColorPicker *cpicker, const rcti *rect, const float *hsv, float *r_xpos, float *r_ypos)
{
- /* duplication of code... well, simple is better now */
- const float centx = BLI_rcti_cent_x_fl(rect);
- const float centy = BLI_rcti_cent_y_fl(rect);
- float radius = (float)min_ii(BLI_rcti_size_x(rect), BLI_rcti_size_y(rect)) / 2.0f;
- float ang, radius_t;
-
- ang = 2.0f * (float)M_PI * hsv[0] + (float)M_PI_2;
-
- if (cpicker->use_color_cubic && (U.color_picker_type == USER_CP_CIRCLE_HSV)) {
- radius_t = (1.0f - pow3f(1.0f - hsv[1]));
- }
- else {
- radius_t = hsv[1];
- }
-
- radius = clamp_f(radius_t, 0.0f, 1.0f) * radius;
- *r_xpos = centx + cosf(-ang) * radius;
- *r_ypos = centy + sinf(-ang) * radius;
+ /* duplication of code... well, simple is better now */
+ const float centx = BLI_rcti_cent_x_fl(rect);
+ const float centy = BLI_rcti_cent_y_fl(rect);
+ float radius = (float)min_ii(BLI_rcti_size_x(rect), BLI_rcti_size_y(rect)) / 2.0f;
+ float ang, radius_t;
+
+ ang = 2.0f * (float)M_PI * hsv[0] + (float)M_PI_2;
+
+ if (cpicker->use_color_cubic && (U.color_picker_type == USER_CP_CIRCLE_HSV)) {
+ radius_t = (1.0f - pow3f(1.0f - hsv[1]));
+ }
+ else {
+ radius_t = hsv[1];
+ }
+
+ radius = clamp_f(radius_t, 0.0f, 1.0f) * radius;
+ *r_xpos = centx + cosf(-ang) * radius;
+ *r_ypos = centy + sinf(-ang) * radius;
}
static void ui_draw_but_HSVCIRCLE(uiBut *but, const uiWidgetColors *wcol, const rcti *rect)
{
- /* TODO(merwin): reimplement as shader for pixel-perfect colors */
-
- const int tot = 64;
- const float radstep = 2.0f * (float)M_PI / (float)tot;
- const float centx = BLI_rcti_cent_x_fl(rect);
- const float centy = BLI_rcti_cent_y_fl(rect);
- float radius = (float)min_ii(BLI_rcti_size_x(rect), BLI_rcti_size_y(rect)) / 2.0f;
-
- ColorPicker *cpicker = but->custom_data;
- float rgb[3], hsv[3], rgb_center[3];
- bool is_color_gamma = ui_but_is_color_gamma(but);
-
- /* Initialize for compatibility. */
- copy_v3_v3(hsv, cpicker->color_data);
-
- /* Compute current hue. */
- ui_but_v3_get(but, rgb);
- ui_scene_linear_to_color_picker_space(but, rgb);
- ui_rgb_to_color_picker_compat_v(rgb, hsv);
-
- CLAMP(hsv[2], 0.0f, 1.0f); /* for display only */
-
- /* exception: if 'lock' is set
- * lock the value of the color wheel to 1.
- * Useful for color correction tools where you're only interested in hue. */
- if (cpicker->use_color_lock) {
- if (U.color_picker_type == USER_CP_CIRCLE_HSV) {
- hsv[2] = 1.0f;
- }
- else {
- hsv[2] = 0.5f;
- }
- }
-
- const float hsv_center[3] = {0.0f, 0.0f, hsv[2]};
- ui_color_picker_to_rgb_v(hsv_center, rgb_center);
- ui_color_picker_to_scene_linear_space(but, rgb_center);
-
- if (!is_color_gamma) {
- ui_block_cm_to_display_space_v3(but->block, rgb_center);
- }
-
- 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_F32, 3, GPU_FETCH_FLOAT);
-
- immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
-
- immBegin(GPU_PRIM_TRI_FAN, tot + 2);
- immAttr3fv(color, rgb_center);
- immVertex2f(pos, centx, centy);
-
- float ang = 0.0f;
- for (int a = 0; a <= tot; a++, ang += radstep) {
- float si = sinf(ang);
- float co = cosf(ang);
- float hsv_ang[3];
- float rgb_ang[3];
-
- ui_hsvcircle_vals_from_pos(
- rect, centx + co * radius, centy + si * radius,
- hsv_ang, hsv_ang + 1);
- hsv_ang[2] = hsv[2];
-
- ui_color_picker_to_rgb_v(hsv_ang, rgb_ang);
- ui_color_picker_to_scene_linear_space(but, rgb_ang);
-
- if (!is_color_gamma) {
- ui_block_cm_to_display_space_v3(but->block, rgb_ang);
- }
-
- immAttr3fv(color, rgb_ang);
- immVertex2f(pos, centx + co * radius, centy + si * radius);
- }
- immEnd();
- immUnbindProgram();
-
- /* fully rounded outline */
- format = immVertexFormat();
- pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
-
- immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
-
- GPU_blend(true);
- GPU_line_smooth(true);
-
- immUniformColor3ubv((uchar *)wcol->outline);
- imm_draw_circle_wire_2d(pos, centx, centy, radius, tot);
-
- immUnbindProgram();
-
- GPU_blend(false);
- GPU_line_smooth(false);
-
- /* cursor */
- copy_v3_v3(hsv, cpicker->color_data);
- ui_but_v3_get(but, rgb);
- ui_scene_linear_to_color_picker_space(but, rgb);
- ui_rgb_to_color_picker_compat_v(rgb, hsv);
-
- float xpos, ypos;
- ui_hsvcircle_pos_from_vals(cpicker, rect, hsv, &xpos, &ypos);
- ui_hsv_cursor(xpos, ypos);
+ /* TODO(merwin): reimplement as shader for pixel-perfect colors */
+
+ const int tot = 64;
+ const float radstep = 2.0f * (float)M_PI / (float)tot;
+ const float centx = BLI_rcti_cent_x_fl(rect);
+ const float centy = BLI_rcti_cent_y_fl(rect);
+ float radius = (float)min_ii(BLI_rcti_size_x(rect), BLI_rcti_size_y(rect)) / 2.0f;
+
+ ColorPicker *cpicker = but->custom_data;
+ float rgb[3], hsv[3], rgb_center[3];
+ bool is_color_gamma = ui_but_is_color_gamma(but);
+
+ /* Initialize for compatibility. */
+ copy_v3_v3(hsv, cpicker->color_data);
+
+ /* Compute current hue. */
+ ui_but_v3_get(but, rgb);
+ ui_scene_linear_to_color_picker_space(but, rgb);
+ ui_rgb_to_color_picker_compat_v(rgb, hsv);
+
+ CLAMP(hsv[2], 0.0f, 1.0f); /* for display only */
+
+ /* exception: if 'lock' is set
+ * lock the value of the color wheel to 1.
+ * Useful for color correction tools where you're only interested in hue. */
+ if (cpicker->use_color_lock) {
+ if (U.color_picker_type == USER_CP_CIRCLE_HSV) {
+ hsv[2] = 1.0f;
+ }
+ else {
+ hsv[2] = 0.5f;
+ }
+ }
+
+ const float hsv_center[3] = {0.0f, 0.0f, hsv[2]};
+ ui_color_picker_to_rgb_v(hsv_center, rgb_center);
+ ui_color_picker_to_scene_linear_space(but, rgb_center);
+
+ if (!is_color_gamma) {
+ ui_block_cm_to_display_space_v3(but->block, rgb_center);
+ }
+
+ 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_F32, 3, GPU_FETCH_FLOAT);
+
+ immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
+
+ immBegin(GPU_PRIM_TRI_FAN, tot + 2);
+ immAttr3fv(color, rgb_center);
+ immVertex2f(pos, centx, centy);
+
+ float ang = 0.0f;
+ for (int a = 0; a <= tot; a++, ang += radstep) {
+ float si = sinf(ang);
+ float co = cosf(ang);
+ float hsv_ang[3];
+ float rgb_ang[3];
+
+ ui_hsvcircle_vals_from_pos(
+ rect, centx + co * radius, centy + si * radius, hsv_ang, hsv_ang + 1);
+ hsv_ang[2] = hsv[2];
+
+ ui_color_picker_to_rgb_v(hsv_ang, rgb_ang);
+ ui_color_picker_to_scene_linear_space(but, rgb_ang);
+
+ if (!is_color_gamma) {
+ ui_block_cm_to_display_space_v3(but->block, rgb_ang);
+ }
+
+ immAttr3fv(color, rgb_ang);
+ immVertex2f(pos, centx + co * radius, centy + si * radius);
+ }
+ immEnd();
+ immUnbindProgram();
+
+ /* fully rounded outline */
+ format = immVertexFormat();
+ pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+
+ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+ GPU_blend(true);
+ GPU_line_smooth(true);
+
+ immUniformColor3ubv((uchar *)wcol->outline);
+ imm_draw_circle_wire_2d(pos, centx, centy, radius, tot);
+
+ immUnbindProgram();
+
+ GPU_blend(false);
+ GPU_line_smooth(false);
+
+ /* cursor */
+ copy_v3_v3(hsv, cpicker->color_data);
+ ui_but_v3_get(but, rgb);
+ ui_scene_linear_to_color_picker_space(but, rgb);
+ ui_rgb_to_color_picker_compat_v(rgb, hsv);
+
+ float xpos, ypos;
+ ui_hsvcircle_pos_from_vals(cpicker, rect, hsv, &xpos, &ypos);
+ ui_hsv_cursor(xpos, ypos);
}
/* ************ custom buttons, old stuff ************** */
@@ -2831,1427 +2972,1462 @@ static void ui_draw_but_HSVCIRCLE(uiBut *but, const uiWidgetColors *wcol, const
/* draws in resolution of 48x4 colors */
void ui_draw_gradient(const rcti *rect, const float hsv[3], const int type, const float alpha)
{
- /* allows for 4 steps (red->yellow) */
- const int steps = 48;
- const float color_step = 1.0f / steps;
- int a;
- float h = hsv[0], s = hsv[1], v = hsv[2];
- float dx, dy, sx1, sx2, sy;
- float col0[4][3]; /* left half, rect bottom to top */
- float col1[4][3]; /* right half, rect bottom to top */
-
- /* draw series of gouraud rects */
-
- switch (type) {
- case UI_GRAD_SV:
- hsv_to_rgb(h, 0.0, 0.0, &col1[0][0], &col1[0][1], &col1[0][2]);
- hsv_to_rgb(h, 0.0, 0.333, &col1[1][0], &col1[1][1], &col1[1][2]);
- hsv_to_rgb(h, 0.0, 0.666, &col1[2][0], &col1[2][1], &col1[2][2]);
- hsv_to_rgb(h, 0.0, 1.0, &col1[3][0], &col1[3][1], &col1[3][2]);
- break;
- case UI_GRAD_HV:
- hsv_to_rgb(0.0, s, 0.0, &col1[0][0], &col1[0][1], &col1[0][2]);
- hsv_to_rgb(0.0, s, 0.333, &col1[1][0], &col1[1][1], &col1[1][2]);
- hsv_to_rgb(0.0, s, 0.666, &col1[2][0], &col1[2][1], &col1[2][2]);
- hsv_to_rgb(0.0, s, 1.0, &col1[3][0], &col1[3][1], &col1[3][2]);
- break;
- case UI_GRAD_HS:
- hsv_to_rgb(0.0, 0.0, v, &col1[0][0], &col1[0][1], &col1[0][2]);
- hsv_to_rgb(0.0, 0.333, v, &col1[1][0], &col1[1][1], &col1[1][2]);
- hsv_to_rgb(0.0, 0.666, v, &col1[2][0], &col1[2][1], &col1[2][2]);
- hsv_to_rgb(0.0, 1.0, v, &col1[3][0], &col1[3][1], &col1[3][2]);
- break;
- case UI_GRAD_H:
- hsv_to_rgb(0.0, 1.0, 1.0, &col1[0][0], &col1[0][1], &col1[0][2]);
- copy_v3_v3(col1[1], col1[0]);
- copy_v3_v3(col1[2], col1[0]);
- copy_v3_v3(col1[3], col1[0]);
- break;
- case UI_GRAD_S:
- hsv_to_rgb(1.0, 0.0, 1.0, &col1[1][0], &col1[1][1], &col1[1][2]);
- copy_v3_v3(col1[0], col1[1]);
- copy_v3_v3(col1[2], col1[1]);
- copy_v3_v3(col1[3], col1[1]);
- break;
- case UI_GRAD_V:
- hsv_to_rgb(1.0, 1.0, 0.0, &col1[2][0], &col1[2][1], &col1[2][2]);
- copy_v3_v3(col1[0], col1[2]);
- copy_v3_v3(col1[1], col1[2]);
- copy_v3_v3(col1[3], col1[2]);
- break;
- default:
- assert(!"invalid 'type' argument");
- hsv_to_rgb(1.0, 1.0, 1.0, &col1[2][0], &col1[2][1], &col1[2][2]);
- copy_v3_v3(col1[0], col1[2]);
- copy_v3_v3(col1[1], col1[2]);
- copy_v3_v3(col1[3], col1[2]);
- break;
- }
-
- /* old below */
- GPUVertFormat *format = immVertexFormat();
- uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
- uint col = GPU_vertformat_attr_add(format, "color", GPU_COMP_F32, 4, GPU_FETCH_FLOAT);
- immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
-
- immBegin(GPU_PRIM_TRIS, steps * 3 * 6);
-
- /* 0.999 = prevent float inaccuracy for steps */
- for (dx = 0.0f; dx < 0.999f; dx += color_step) {
- const float dx_next = dx + color_step;
-
- /* previous color */
- copy_v3_v3(col0[0], col1[0]);
- copy_v3_v3(col0[1], col1[1]);
- copy_v3_v3(col0[2], col1[2]);
- copy_v3_v3(col0[3], col1[3]);
-
- /* new color */
- switch (type) {
- case UI_GRAD_SV:
- hsv_to_rgb(h, dx, 0.0, &col1[0][0], &col1[0][1], &col1[0][2]);
- hsv_to_rgb(h, dx, 0.333, &col1[1][0], &col1[1][1], &col1[1][2]);
- hsv_to_rgb(h, dx, 0.666, &col1[2][0], &col1[2][1], &col1[2][2]);
- hsv_to_rgb(h, dx, 1.0, &col1[3][0], &col1[3][1], &col1[3][2]);
- break;
- case UI_GRAD_HV:
- hsv_to_rgb(dx_next, s, 0.0, &col1[0][0], &col1[0][1], &col1[0][2]);
- hsv_to_rgb(dx_next, s, 0.333, &col1[1][0], &col1[1][1], &col1[1][2]);
- hsv_to_rgb(dx_next, s, 0.666, &col1[2][0], &col1[2][1], &col1[2][2]);
- hsv_to_rgb(dx_next, s, 1.0, &col1[3][0], &col1[3][1], &col1[3][2]);
- break;
- case UI_GRAD_HS:
- hsv_to_rgb(dx_next, 0.0, v, &col1[0][0], &col1[0][1], &col1[0][2]);
- hsv_to_rgb(dx_next, 0.333, v, &col1[1][0], &col1[1][1], &col1[1][2]);
- hsv_to_rgb(dx_next, 0.666, v, &col1[2][0], &col1[2][1], &col1[2][2]);
- hsv_to_rgb(dx_next, 1.0, v, &col1[3][0], &col1[3][1], &col1[3][2]);
- break;
- case UI_GRAD_H:
- /* annoying but without this the color shifts - could be solved some other way
- * - campbell */
- hsv_to_rgb(dx_next, 1.0, 1.0, &col1[0][0], &col1[0][1], &col1[0][2]);
- copy_v3_v3(col1[1], col1[0]);
- copy_v3_v3(col1[2], col1[0]);
- copy_v3_v3(col1[3], col1[0]);
- break;
- case UI_GRAD_S:
- hsv_to_rgb(h, dx, 1.0, &col1[1][0], &col1[1][1], &col1[1][2]);
- copy_v3_v3(col1[0], col1[1]);
- copy_v3_v3(col1[2], col1[1]);
- copy_v3_v3(col1[3], col1[1]);
- break;
- case UI_GRAD_V:
- hsv_to_rgb(h, 1.0, dx, &col1[2][0], &col1[2][1], &col1[2][2]);
- copy_v3_v3(col1[0], col1[2]);
- copy_v3_v3(col1[1], col1[2]);
- copy_v3_v3(col1[3], col1[2]);
- break;
- }
-
- /* rect */
- sx1 = rect->xmin + dx * BLI_rcti_size_x(rect);
- sx2 = rect->xmin + dx_next * BLI_rcti_size_x(rect);
- sy = rect->ymin;
- dy = (float)BLI_rcti_size_y(rect) / 3.0f;
-
- for (a = 0; a < 3; a++, sy += dy) {
- immAttr4f(col, col0[a][0], col0[a][1], col0[a][2], alpha);
- immVertex2f(pos, sx1, sy);
-
- immAttr4f(col, col1[a][0], col1[a][1], col1[a][2], alpha);
- immVertex2f(pos, sx2, sy);
-
- immAttr4f(col, col1[a + 1][0], col1[a + 1][1], col1[a + 1][2], alpha);
- immVertex2f(pos, sx2, sy + dy);
-
- immAttr4f(col, col0[a][0], col0[a][1], col0[a][2], alpha);
- immVertex2f(pos, sx1, sy);
-
- immAttr4f(col, col1[a + 1][0], col1[a + 1][1], col1[a + 1][2], alpha);
- immVertex2f(pos, sx2, sy + dy);
-
- immAttr4f(col, col0[a + 1][0], col0[a + 1][1], col0[a + 1][2], alpha);
- immVertex2f(pos, sx1, sy + dy);
- }
- }
- immEnd();
-
- immUnbindProgram();
+ /* allows for 4 steps (red->yellow) */
+ const int steps = 48;
+ const float color_step = 1.0f / steps;
+ int a;
+ float h = hsv[0], s = hsv[1], v = hsv[2];
+ float dx, dy, sx1, sx2, sy;
+ float col0[4][3]; /* left half, rect bottom to top */
+ float col1[4][3]; /* right half, rect bottom to top */
+
+ /* draw series of gouraud rects */
+
+ switch (type) {
+ case UI_GRAD_SV:
+ hsv_to_rgb(h, 0.0, 0.0, &col1[0][0], &col1[0][1], &col1[0][2]);
+ hsv_to_rgb(h, 0.0, 0.333, &col1[1][0], &col1[1][1], &col1[1][2]);
+ hsv_to_rgb(h, 0.0, 0.666, &col1[2][0], &col1[2][1], &col1[2][2]);
+ hsv_to_rgb(h, 0.0, 1.0, &col1[3][0], &col1[3][1], &col1[3][2]);
+ break;
+ case UI_GRAD_HV:
+ hsv_to_rgb(0.0, s, 0.0, &col1[0][0], &col1[0][1], &col1[0][2]);
+ hsv_to_rgb(0.0, s, 0.333, &col1[1][0], &col1[1][1], &col1[1][2]);
+ hsv_to_rgb(0.0, s, 0.666, &col1[2][0], &col1[2][1], &col1[2][2]);
+ hsv_to_rgb(0.0, s, 1.0, &col1[3][0], &col1[3][1], &col1[3][2]);
+ break;
+ case UI_GRAD_HS:
+ hsv_to_rgb(0.0, 0.0, v, &col1[0][0], &col1[0][1], &col1[0][2]);
+ hsv_to_rgb(0.0, 0.333, v, &col1[1][0], &col1[1][1], &col1[1][2]);
+ hsv_to_rgb(0.0, 0.666, v, &col1[2][0], &col1[2][1], &col1[2][2]);
+ hsv_to_rgb(0.0, 1.0, v, &col1[3][0], &col1[3][1], &col1[3][2]);
+ break;
+ case UI_GRAD_H:
+ hsv_to_rgb(0.0, 1.0, 1.0, &col1[0][0], &col1[0][1], &col1[0][2]);
+ copy_v3_v3(col1[1], col1[0]);
+ copy_v3_v3(col1[2], col1[0]);
+ copy_v3_v3(col1[3], col1[0]);
+ break;
+ case UI_GRAD_S:
+ hsv_to_rgb(1.0, 0.0, 1.0, &col1[1][0], &col1[1][1], &col1[1][2]);
+ copy_v3_v3(col1[0], col1[1]);
+ copy_v3_v3(col1[2], col1[1]);
+ copy_v3_v3(col1[3], col1[1]);
+ break;
+ case UI_GRAD_V:
+ hsv_to_rgb(1.0, 1.0, 0.0, &col1[2][0], &col1[2][1], &col1[2][2]);
+ copy_v3_v3(col1[0], col1[2]);
+ copy_v3_v3(col1[1], col1[2]);
+ copy_v3_v3(col1[3], col1[2]);
+ break;
+ default:
+ assert(!"invalid 'type' argument");
+ hsv_to_rgb(1.0, 1.0, 1.0, &col1[2][0], &col1[2][1], &col1[2][2]);
+ copy_v3_v3(col1[0], col1[2]);
+ copy_v3_v3(col1[1], col1[2]);
+ copy_v3_v3(col1[3], col1[2]);
+ break;
+ }
+
+ /* old below */
+ GPUVertFormat *format = immVertexFormat();
+ uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+ uint col = GPU_vertformat_attr_add(format, "color", GPU_COMP_F32, 4, GPU_FETCH_FLOAT);
+ immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
+
+ immBegin(GPU_PRIM_TRIS, steps * 3 * 6);
+
+ /* 0.999 = prevent float inaccuracy for steps */
+ for (dx = 0.0f; dx < 0.999f; dx += color_step) {
+ const float dx_next = dx + color_step;
+
+ /* previous color */
+ copy_v3_v3(col0[0], col1[0]);
+ copy_v3_v3(col0[1], col1[1]);
+ copy_v3_v3(col0[2], col1[2]);
+ copy_v3_v3(col0[3], col1[3]);
+
+ /* new color */
+ switch (type) {
+ case UI_GRAD_SV:
+ hsv_to_rgb(h, dx, 0.0, &col1[0][0], &col1[0][1], &col1[0][2]);
+ hsv_to_rgb(h, dx, 0.333, &col1[1][0], &col1[1][1], &col1[1][2]);
+ hsv_to_rgb(h, dx, 0.666, &col1[2][0], &col1[2][1], &col1[2][2]);
+ hsv_to_rgb(h, dx, 1.0, &col1[3][0], &col1[3][1], &col1[3][2]);
+ break;
+ case UI_GRAD_HV:
+ hsv_to_rgb(dx_next, s, 0.0, &col1[0][0], &col1[0][1], &col1[0][2]);
+ hsv_to_rgb(dx_next, s, 0.333, &col1[1][0], &col1[1][1], &col1[1][2]);
+ hsv_to_rgb(dx_next, s, 0.666, &col1[2][0], &col1[2][1], &col1[2][2]);
+ hsv_to_rgb(dx_next, s, 1.0, &col1[3][0], &col1[3][1], &col1[3][2]);
+ break;
+ case UI_GRAD_HS:
+ hsv_to_rgb(dx_next, 0.0, v, &col1[0][0], &col1[0][1], &col1[0][2]);
+ hsv_to_rgb(dx_next, 0.333, v, &col1[1][0], &col1[1][1], &col1[1][2]);
+ hsv_to_rgb(dx_next, 0.666, v, &col1[2][0], &col1[2][1], &col1[2][2]);
+ hsv_to_rgb(dx_next, 1.0, v, &col1[3][0], &col1[3][1], &col1[3][2]);
+ break;
+ case UI_GRAD_H:
+ /* annoying but without this the color shifts - could be solved some other way
+ * - campbell */
+ hsv_to_rgb(dx_next, 1.0, 1.0, &col1[0][0], &col1[0][1], &col1[0][2]);
+ copy_v3_v3(col1[1], col1[0]);
+ copy_v3_v3(col1[2], col1[0]);
+ copy_v3_v3(col1[3], col1[0]);
+ break;
+ case UI_GRAD_S:
+ hsv_to_rgb(h, dx, 1.0, &col1[1][0], &col1[1][1], &col1[1][2]);
+ copy_v3_v3(col1[0], col1[1]);
+ copy_v3_v3(col1[2], col1[1]);
+ copy_v3_v3(col1[3], col1[1]);
+ break;
+ case UI_GRAD_V:
+ hsv_to_rgb(h, 1.0, dx, &col1[2][0], &col1[2][1], &col1[2][2]);
+ copy_v3_v3(col1[0], col1[2]);
+ copy_v3_v3(col1[1], col1[2]);
+ copy_v3_v3(col1[3], col1[2]);
+ break;
+ }
+
+ /* rect */
+ sx1 = rect->xmin + dx * BLI_rcti_size_x(rect);
+ sx2 = rect->xmin + dx_next * BLI_rcti_size_x(rect);
+ sy = rect->ymin;
+ dy = (float)BLI_rcti_size_y(rect) / 3.0f;
+
+ for (a = 0; a < 3; a++, sy += dy) {
+ immAttr4f(col, col0[a][0], col0[a][1], col0[a][2], alpha);
+ immVertex2f(pos, sx1, sy);
+
+ immAttr4f(col, col1[a][0], col1[a][1], col1[a][2], alpha);
+ immVertex2f(pos, sx2, sy);
+
+ immAttr4f(col, col1[a + 1][0], col1[a + 1][1], col1[a + 1][2], alpha);
+ immVertex2f(pos, sx2, sy + dy);
+
+ immAttr4f(col, col0[a][0], col0[a][1], col0[a][2], alpha);
+ immVertex2f(pos, sx1, sy);
+
+ immAttr4f(col, col1[a + 1][0], col1[a + 1][1], col1[a + 1][2], alpha);
+ immVertex2f(pos, sx2, sy + dy);
+
+ immAttr4f(col, col0[a + 1][0], col0[a + 1][1], col0[a + 1][2], alpha);
+ immVertex2f(pos, sx1, sy + dy);
+ }
+ }
+ immEnd();
+
+ immUnbindProgram();
}
void ui_hsvcube_pos_from_vals(
- const uiBut *but, const rcti *rect, const float *hsv,
- float *r_xp, float *r_yp)
+ const uiBut *but, const rcti *rect, const float *hsv, float *r_xp, float *r_yp)
{
- float x = 0.0f, y = 0.0f;
-
- switch ((int)but->a1) {
- case UI_GRAD_SV:
- x = hsv[1]; y = hsv[2]; break;
- case UI_GRAD_HV:
- x = hsv[0]; y = hsv[2]; break;
- case UI_GRAD_HS:
- x = hsv[0]; y = hsv[1]; break;
- case UI_GRAD_H:
- x = hsv[0]; y = 0.5; break;
- case UI_GRAD_S:
- x = hsv[1]; y = 0.5; break;
- case UI_GRAD_V:
- x = hsv[2]; y = 0.5; break;
- case UI_GRAD_L_ALT:
- x = 0.5f;
- /* exception only for value strip - use the range set in but->min/max */
- y = hsv[2];
- break;
- case UI_GRAD_V_ALT:
- x = 0.5f;
- /* exception only for value strip - use the range set in but->min/max */
- y = (hsv[2] - but->softmin) / (but->softmax - but->softmin);
- break;
- }
-
- /* cursor */
- *r_xp = rect->xmin + x * BLI_rcti_size_x(rect);
- *r_yp = rect->ymin + y * BLI_rcti_size_y(rect);
+ float x = 0.0f, y = 0.0f;
+
+ switch ((int)but->a1) {
+ case UI_GRAD_SV:
+ x = hsv[1];
+ y = hsv[2];
+ break;
+ case UI_GRAD_HV:
+ x = hsv[0];
+ y = hsv[2];
+ break;
+ case UI_GRAD_HS:
+ x = hsv[0];
+ y = hsv[1];
+ break;
+ case UI_GRAD_H:
+ x = hsv[0];
+ y = 0.5;
+ break;
+ case UI_GRAD_S:
+ x = hsv[1];
+ y = 0.5;
+ break;
+ case UI_GRAD_V:
+ x = hsv[2];
+ y = 0.5;
+ break;
+ case UI_GRAD_L_ALT:
+ x = 0.5f;
+ /* exception only for value strip - use the range set in but->min/max */
+ y = hsv[2];
+ break;
+ case UI_GRAD_V_ALT:
+ x = 0.5f;
+ /* exception only for value strip - use the range set in but->min/max */
+ y = (hsv[2] - but->softmin) / (but->softmax - but->softmin);
+ break;
+ }
+
+ /* cursor */
+ *r_xp = rect->xmin + x * BLI_rcti_size_x(rect);
+ *r_yp = rect->ymin + y * BLI_rcti_size_y(rect);
}
static void ui_draw_but_HSVCUBE(uiBut *but, const rcti *rect)
{
- float rgb[3];
- float x = 0.0f, y = 0.0f;
- ColorPicker *cpicker = but->custom_data;
- float *hsv = cpicker->color_data;
- float hsv_n[3];
+ float rgb[3];
+ float x = 0.0f, y = 0.0f;
+ ColorPicker *cpicker = but->custom_data;
+ float *hsv = cpicker->color_data;
+ float hsv_n[3];
- /* Initialize for compatibility. */
- copy_v3_v3(hsv_n, hsv);
+ /* Initialize for compatibility. */
+ copy_v3_v3(hsv_n, hsv);
- ui_but_v3_get(but, rgb);
- ui_scene_linear_to_color_picker_space(but, rgb);
- rgb_to_hsv_compat_v(rgb, hsv_n);
+ ui_but_v3_get(but, rgb);
+ ui_scene_linear_to_color_picker_space(but, rgb);
+ rgb_to_hsv_compat_v(rgb, hsv_n);
- ui_draw_gradient(rect, hsv_n, but->a1, 1.0f);
+ ui_draw_gradient(rect, hsv_n, but->a1, 1.0f);
- ui_hsvcube_pos_from_vals(but, rect, hsv_n, &x, &y);
- CLAMP(x, rect->xmin + 3.0f, rect->xmax - 3.0f);
- CLAMP(y, rect->ymin + 3.0f, rect->ymax - 3.0f);
+ ui_hsvcube_pos_from_vals(but, rect, hsv_n, &x, &y);
+ CLAMP(x, rect->xmin + 3.0f, rect->xmax - 3.0f);
+ CLAMP(y, rect->ymin + 3.0f, rect->ymax - 3.0f);
- ui_hsv_cursor(x, y);
+ ui_hsv_cursor(x, y);
- /* outline */
- uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
- immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
- immUniformColor3ub(0, 0, 0);
- imm_draw_box_wire_2d(pos, (rect->xmin), (rect->ymin), (rect->xmax), (rect->ymax));
- immUnbindProgram();
+ /* outline */
+ uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+ immUniformColor3ub(0, 0, 0);
+ imm_draw_box_wire_2d(pos, (rect->xmin), (rect->ymin), (rect->xmax), (rect->ymax));
+ immUnbindProgram();
}
/* vertical 'value' slider, using new widget code */
static void ui_draw_but_HSV_v(uiBut *but, const rcti *rect)
{
- bTheme *btheme = UI_GetTheme();
- uiWidgetColors *wcol = &btheme->tui.wcol_numslider;
- uiWidgetBase wtb;
- const float rad = wcol->roundness * BLI_rcti_size_x(rect);
- float x, y;
- float rgb[3], hsv[3], v;
-
- ui_but_v3_get(but, rgb);
- ui_scene_linear_to_color_picker_space(but, rgb);
-
- if (but->a1 == UI_GRAD_L_ALT) {
- rgb_to_hsl_v(rgb, hsv);
- }
- else {
- rgb_to_hsv_v(rgb, hsv);
- }
- v = hsv[2];
-
- /* map v from property range to [0,1] */
- if (but->a1 == UI_GRAD_V_ALT) {
- float min = but->softmin, max = but->softmax;
- v = (v - min) / (max - min);
- }
-
- widget_init(&wtb);
-
- /* fully rounded */
- round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
-
- /* setup temp colors */
- widgetbase_draw(
- &wtb,
- &((uiWidgetColors){
- .outline = {0, 0, 0, 255},
- .inner = {128, 128, 128, 255},
- .shadetop = 127,
- .shadedown = -128,
- .shaded = 1,
- })
- );
-
- /* We are drawing on top of widget bases. Flush cache. */
- GPU_blend(true);
- UI_widgetbase_draw_cache_flush();
- GPU_blend(false);
-
- /* cursor */
- x = rect->xmin + 0.5f * BLI_rcti_size_x(rect);
- y = rect->ymin + v * BLI_rcti_size_y(rect);
- CLAMP(y, rect->ymin + 3.0f, rect->ymax - 3.0f);
-
- ui_hsv_cursor(x, y);
+ bTheme *btheme = UI_GetTheme();
+ uiWidgetColors *wcol = &btheme->tui.wcol_numslider;
+ uiWidgetBase wtb;
+ const float rad = wcol->roundness * BLI_rcti_size_x(rect);
+ float x, y;
+ float rgb[3], hsv[3], v;
+
+ ui_but_v3_get(but, rgb);
+ ui_scene_linear_to_color_picker_space(but, rgb);
+
+ if (but->a1 == UI_GRAD_L_ALT) {
+ rgb_to_hsl_v(rgb, hsv);
+ }
+ else {
+ rgb_to_hsv_v(rgb, hsv);
+ }
+ v = hsv[2];
+
+ /* map v from property range to [0,1] */
+ if (but->a1 == UI_GRAD_V_ALT) {
+ float min = but->softmin, max = but->softmax;
+ v = (v - min) / (max - min);
+ }
+
+ widget_init(&wtb);
+
+ /* fully rounded */
+ round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
+
+ /* setup temp colors */
+ widgetbase_draw(&wtb,
+ &((uiWidgetColors){
+ .outline = {0, 0, 0, 255},
+ .inner = {128, 128, 128, 255},
+ .shadetop = 127,
+ .shadedown = -128,
+ .shaded = 1,
+ }));
+
+ /* We are drawing on top of widget bases. Flush cache. */
+ GPU_blend(true);
+ UI_widgetbase_draw_cache_flush();
+ GPU_blend(false);
+
+ /* cursor */
+ x = rect->xmin + 0.5f * BLI_rcti_size_x(rect);
+ y = rect->ymin + v * BLI_rcti_size_y(rect);
+ CLAMP(y, rect->ymin + 3.0f, rect->ymax - 3.0f);
+
+ ui_hsv_cursor(x, y);
}
/* Generic round-box drawing. */
static void ui_draw_roundbox(const rcti *rect, const float rad, const uiWidgetColors *wcol)
{
- uiWidgetBase wtb;
- widget_init(&wtb);
- round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
- widgetbase_draw(&wtb, wcol);
-
- /* We are drawing on top of widget bases. Flush cache. */
- GPU_blend(true);
- UI_widgetbase_draw_cache_flush();
- GPU_blend(false);
+ uiWidgetBase wtb;
+ widget_init(&wtb);
+ round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
+ widgetbase_draw(&wtb, wcol);
+
+ /* We are drawing on top of widget bases. Flush cache. */
+ GPU_blend(true);
+ UI_widgetbase_draw_cache_flush();
+ GPU_blend(false);
}
-
/* ************ separator, for menus etc ***************** */
static void ui_draw_separator(const rcti *rect, const uiWidgetColors *wcol)
{
- int y = rect->ymin + BLI_rcti_size_y(rect) / 2 - 1;
- uchar col[4] = {
- wcol->text[0],
- wcol->text[1],
- wcol->text[2],
- 30,
- };
+ int y = rect->ymin + BLI_rcti_size_y(rect) / 2 - 1;
+ uchar col[4] = {
+ wcol->text[0],
+ wcol->text[1],
+ wcol->text[2],
+ 30,
+ };
- uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
- immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+ uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
- GPU_blend(true);
- immUniformColor4ubv(col);
- GPU_line_width(1.0f);
+ GPU_blend(true);
+ immUniformColor4ubv(col);
+ GPU_line_width(1.0f);
- immBegin(GPU_PRIM_LINES, 2);
- immVertex2f(pos, rect->xmin, y);
- immVertex2f(pos, rect->xmax, y);
- immEnd();
+ immBegin(GPU_PRIM_LINES, 2);
+ immVertex2f(pos, rect->xmin, y);
+ immVertex2f(pos, rect->xmax, y);
+ immEnd();
- GPU_blend(false);
+ GPU_blend(false);
- immUnbindProgram();
+ immUnbindProgram();
}
/* ************ button callbacks, draw ***************** */
-static void widget_numbut_draw(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign, bool emboss)
+static void widget_numbut_draw(
+ uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign, bool emboss)
{
- uiWidgetBase wtb;
- const float rad = wcol->roundness * BLI_rcti_size_y(rect);
- const int handle_width = min_ii(BLI_rcti_size_x(rect) / 3, BLI_rcti_size_y(rect) * 0.7f);
-
- if (state & UI_SELECT) {
- SWAP(short, wcol->shadetop, wcol->shadedown);
- }
-
- widget_init(&wtb);
-
- if (!emboss) {
- round_box_edges(&wtb, roundboxalign, rect, rad);
- }
- else {
- wtb.draw_inner = false;
- wtb.draw_outline = false;
- }
-
- /* decoration */
- if ((state & UI_ACTIVE) && !(state & UI_STATE_TEXT_INPUT)) {
- uiWidgetColors wcol_zone;
- uiWidgetBase wtb_zone;
- rcti rect_zone;
- int roundboxalign_zone;
-
- /* left arrow zone */
- widget_init(&wtb_zone);
- wtb_zone.draw_outline = false;
- wtb_zone.draw_emboss = false;
-
- wcol_zone = *wcol;
- copy_v3_v3_char(wcol_zone.item, wcol->text);
- if (state & UI_STATE_ACTIVE_LEFT) {
- widget_active_color(wcol_zone.inner);
- }
-
- rect_zone = *rect;
- rect_zone.xmax = rect->xmin + handle_width + U.pixelsize;
- roundboxalign_zone = roundboxalign & ~(UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT);
- round_box_edges(&wtb_zone, roundboxalign_zone, &rect_zone, rad);
-
- shape_preset_init_number_arrows(&wtb_zone.tria1, &rect_zone, 0.6f, 'l');
- widgetbase_draw(&wtb_zone, &wcol_zone);
-
- /* right arrow zone */
- widget_init(&wtb_zone);
- wtb_zone.draw_outline = false;
- wtb_zone.draw_emboss = false;
- wtb_zone.tria1.type = ROUNDBOX_TRIA_ARROWS;
-
- wcol_zone = *wcol;
- copy_v3_v3_char(wcol_zone.item, wcol->text);
- if (state & UI_STATE_ACTIVE_RIGHT) {
- widget_active_color(wcol_zone.inner);
- }
-
- rect_zone = *rect;
- rect_zone.xmin = rect->xmax - handle_width - U.pixelsize;
- roundboxalign_zone = roundboxalign & ~(UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT);
- round_box_edges(&wtb_zone, roundboxalign_zone, &rect_zone, rad);
-
- shape_preset_init_number_arrows(&wtb_zone.tria2, &rect_zone, 0.6f, 'r');
- widgetbase_draw(&wtb_zone, &wcol_zone);
-
- /* middle highlight zone */
- widget_init(&wtb_zone);
- wtb_zone.draw_outline = false;
- wtb_zone.draw_emboss = false;
-
- wcol_zone = *wcol;
- copy_v3_v3_char(wcol_zone.item, wcol->text);
- if (!(state & (UI_STATE_ACTIVE_LEFT | UI_STATE_ACTIVE_RIGHT))) {
- widget_active_color(wcol_zone.inner);
- }
-
- rect_zone = *rect;
- rect_zone.xmin = rect->xmin + handle_width - U.pixelsize;
- rect_zone.xmax = rect->xmax - handle_width + U.pixelsize;
- round_box_edges(&wtb_zone, 0, &rect_zone, 0);
- widgetbase_draw(&wtb_zone, &wcol_zone);
-
- /* outline */
- wtb.draw_inner = false;
- widgetbase_draw(&wtb, wcol);
- }
- else {
- /* inner and outline */
- widgetbase_draw(&wtb, wcol);
- }
-
- if (!(state & UI_STATE_TEXT_INPUT)) {
- const float textofs = 0.425f * BLI_rcti_size_y(rect);
-
- /* text space */
- rect->xmin += textofs;
- rect->xmax -= textofs;
- }
+ uiWidgetBase wtb;
+ const float rad = wcol->roundness * BLI_rcti_size_y(rect);
+ const int handle_width = min_ii(BLI_rcti_size_x(rect) / 3, BLI_rcti_size_y(rect) * 0.7f);
+
+ if (state & UI_SELECT) {
+ SWAP(short, wcol->shadetop, wcol->shadedown);
+ }
+
+ widget_init(&wtb);
+
+ if (!emboss) {
+ round_box_edges(&wtb, roundboxalign, rect, rad);
+ }
+ else {
+ wtb.draw_inner = false;
+ wtb.draw_outline = false;
+ }
+
+ /* decoration */
+ if ((state & UI_ACTIVE) && !(state & UI_STATE_TEXT_INPUT)) {
+ uiWidgetColors wcol_zone;
+ uiWidgetBase wtb_zone;
+ rcti rect_zone;
+ int roundboxalign_zone;
+
+ /* left arrow zone */
+ widget_init(&wtb_zone);
+ wtb_zone.draw_outline = false;
+ wtb_zone.draw_emboss = false;
+
+ wcol_zone = *wcol;
+ copy_v3_v3_char(wcol_zone.item, wcol->text);
+ if (state & UI_STATE_ACTIVE_LEFT) {
+ widget_active_color(wcol_zone.inner);
+ }
+
+ rect_zone = *rect;
+ rect_zone.xmax = rect->xmin + handle_width + U.pixelsize;
+ roundboxalign_zone = roundboxalign & ~(UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT);
+ round_box_edges(&wtb_zone, roundboxalign_zone, &rect_zone, rad);
+
+ shape_preset_init_number_arrows(&wtb_zone.tria1, &rect_zone, 0.6f, 'l');
+ widgetbase_draw(&wtb_zone, &wcol_zone);
+
+ /* right arrow zone */
+ widget_init(&wtb_zone);
+ wtb_zone.draw_outline = false;
+ wtb_zone.draw_emboss = false;
+ wtb_zone.tria1.type = ROUNDBOX_TRIA_ARROWS;
+
+ wcol_zone = *wcol;
+ copy_v3_v3_char(wcol_zone.item, wcol->text);
+ if (state & UI_STATE_ACTIVE_RIGHT) {
+ widget_active_color(wcol_zone.inner);
+ }
+
+ rect_zone = *rect;
+ rect_zone.xmin = rect->xmax - handle_width - U.pixelsize;
+ roundboxalign_zone = roundboxalign & ~(UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT);
+ round_box_edges(&wtb_zone, roundboxalign_zone, &rect_zone, rad);
+
+ shape_preset_init_number_arrows(&wtb_zone.tria2, &rect_zone, 0.6f, 'r');
+ widgetbase_draw(&wtb_zone, &wcol_zone);
+
+ /* middle highlight zone */
+ widget_init(&wtb_zone);
+ wtb_zone.draw_outline = false;
+ wtb_zone.draw_emboss = false;
+
+ wcol_zone = *wcol;
+ copy_v3_v3_char(wcol_zone.item, wcol->text);
+ if (!(state & (UI_STATE_ACTIVE_LEFT | UI_STATE_ACTIVE_RIGHT))) {
+ widget_active_color(wcol_zone.inner);
+ }
+
+ rect_zone = *rect;
+ rect_zone.xmin = rect->xmin + handle_width - U.pixelsize;
+ rect_zone.xmax = rect->xmax - handle_width + U.pixelsize;
+ round_box_edges(&wtb_zone, 0, &rect_zone, 0);
+ widgetbase_draw(&wtb_zone, &wcol_zone);
+
+ /* outline */
+ wtb.draw_inner = false;
+ widgetbase_draw(&wtb, wcol);
+ }
+ else {
+ /* inner and outline */
+ widgetbase_draw(&wtb, wcol);
+ }
+
+ if (!(state & UI_STATE_TEXT_INPUT)) {
+ const float textofs = 0.425f * BLI_rcti_size_y(rect);
+
+ /* text space */
+ rect->xmin += textofs;
+ rect->xmax -= textofs;
+ }
}
static void widget_numbut(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
{
- widget_numbut_draw(wcol, rect, state, roundboxalign, false);
+ widget_numbut_draw(wcol, rect, state, roundboxalign, false);
}
/**
* Draw number buttons still with triangles when field is not embossed
*/
-static void widget_numbut_embossn(uiBut *UNUSED(but), uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
+static void widget_numbut_embossn(
+ uiBut *UNUSED(but), uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
{
- widget_numbut_draw(wcol, rect, state, roundboxalign, true);
+ widget_numbut_draw(wcol, rect, state, roundboxalign, true);
}
/* function in use for buttons and for view2d sliders */
void UI_draw_widget_scroll(uiWidgetColors *wcol, const rcti *rect, const rcti *slider, int state)
{
- uiWidgetBase wtb;
- int horizontal;
- float rad;
- bool outline = false;
-
- widget_init(&wtb);
-
- /* determine horizontal/vertical */
- horizontal = (BLI_rcti_size_x(rect) > BLI_rcti_size_y(rect));
-
- if (horizontal) {
- rad = wcol->roundness * BLI_rcti_size_y(rect);
- }
- else {
- rad = wcol->roundness * BLI_rcti_size_x(rect);
- }
-
- wtb.uniform_params.shade_dir = (horizontal) ? 1.0f : 0.0;
-
- /* draw back part, colors swapped and shading inverted */
- if (horizontal) {
- SWAP(short, wcol->shadetop, wcol->shadedown);
- }
-
- round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
- widgetbase_draw(&wtb, wcol);
-
- /* slider */
- if ((BLI_rcti_size_x(slider) < 2) || (BLI_rcti_size_y(slider) < 2)) {
- /* pass */
- }
- else {
- SWAP(short, wcol->shadetop, wcol->shadedown);
-
- copy_v4_v4_char(wcol->inner, wcol->item);
-
- if (wcol->shadetop > wcol->shadedown) {
- wcol->shadetop += 20; /* XXX violates themes... */
- }
- else {
- wcol->shadedown += 20;
- }
-
- if (state & UI_SCROLL_PRESSED) {
- wcol->inner[0] = wcol->inner[0] >= 250 ? 255 : wcol->inner[0] + 5;
- wcol->inner[1] = wcol->inner[1] >= 250 ? 255 : wcol->inner[1] + 5;
- wcol->inner[2] = wcol->inner[2] >= 250 ? 255 : wcol->inner[2] + 5;
- }
-
- /* draw */
- wtb.draw_emboss = false; /* only emboss once */
-
- /* exception for progress bar */
- if (state & UI_SCROLL_NO_OUTLINE) {
- SWAP(bool, outline, wtb.draw_outline);
- }
-
- round_box_edges(&wtb, UI_CNR_ALL, slider, rad);
-
- if (state & UI_SCROLL_ARROWS) {
- if (wcol->item[0] > 48) {
- wcol->item[0] -= 48;
- }
- if (wcol->item[1] > 48) {
- wcol->item[1] -= 48;
- }
- if (wcol->item[2] > 48) {
- wcol->item[2] -= 48;
- }
- wcol->item[3] = 255;
-
- if (horizontal) {
- shape_preset_init_scroll_circle(&wtb.tria1, slider, 0.6f, 'l');
- shape_preset_init_scroll_circle(&wtb.tria2, slider, 0.6f, 'r');
- }
- else {
- shape_preset_init_scroll_circle(&wtb.tria1, slider, 0.6f, 'b');
- shape_preset_init_scroll_circle(&wtb.tria2, slider, 0.6f, 't');
- }
- }
- widgetbase_draw(&wtb, wcol);
-
- if (state & UI_SCROLL_NO_OUTLINE) {
- SWAP(bool, outline, wtb.draw_outline);
- }
- }
+ uiWidgetBase wtb;
+ int horizontal;
+ float rad;
+ bool outline = false;
+
+ widget_init(&wtb);
+
+ /* determine horizontal/vertical */
+ horizontal = (BLI_rcti_size_x(rect) > BLI_rcti_size_y(rect));
+
+ if (horizontal) {
+ rad = wcol->roundness * BLI_rcti_size_y(rect);
+ }
+ else {
+ rad = wcol->roundness * BLI_rcti_size_x(rect);
+ }
+
+ wtb.uniform_params.shade_dir = (horizontal) ? 1.0f : 0.0;
+
+ /* draw back part, colors swapped and shading inverted */
+ if (horizontal) {
+ SWAP(short, wcol->shadetop, wcol->shadedown);
+ }
+
+ round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
+ widgetbase_draw(&wtb, wcol);
+
+ /* slider */
+ if ((BLI_rcti_size_x(slider) < 2) || (BLI_rcti_size_y(slider) < 2)) {
+ /* pass */
+ }
+ else {
+ SWAP(short, wcol->shadetop, wcol->shadedown);
+
+ copy_v4_v4_char(wcol->inner, wcol->item);
+
+ if (wcol->shadetop > wcol->shadedown) {
+ wcol->shadetop += 20; /* XXX violates themes... */
+ }
+ else {
+ wcol->shadedown += 20;
+ }
+
+ if (state & UI_SCROLL_PRESSED) {
+ wcol->inner[0] = wcol->inner[0] >= 250 ? 255 : wcol->inner[0] + 5;
+ wcol->inner[1] = wcol->inner[1] >= 250 ? 255 : wcol->inner[1] + 5;
+ wcol->inner[2] = wcol->inner[2] >= 250 ? 255 : wcol->inner[2] + 5;
+ }
+
+ /* draw */
+ wtb.draw_emboss = false; /* only emboss once */
+
+ /* exception for progress bar */
+ if (state & UI_SCROLL_NO_OUTLINE) {
+ SWAP(bool, outline, wtb.draw_outline);
+ }
+
+ round_box_edges(&wtb, UI_CNR_ALL, slider, rad);
+
+ if (state & UI_SCROLL_ARROWS) {
+ if (wcol->item[0] > 48) {
+ wcol->item[0] -= 48;
+ }
+ if (wcol->item[1] > 48) {
+ wcol->item[1] -= 48;
+ }
+ if (wcol->item[2] > 48) {
+ wcol->item[2] -= 48;
+ }
+ wcol->item[3] = 255;
+
+ if (horizontal) {
+ shape_preset_init_scroll_circle(&wtb.tria1, slider, 0.6f, 'l');
+ shape_preset_init_scroll_circle(&wtb.tria2, slider, 0.6f, 'r');
+ }
+ else {
+ shape_preset_init_scroll_circle(&wtb.tria1, slider, 0.6f, 'b');
+ shape_preset_init_scroll_circle(&wtb.tria2, slider, 0.6f, 't');
+ }
+ }
+ widgetbase_draw(&wtb, wcol);
+
+ if (state & UI_SCROLL_NO_OUTLINE) {
+ SWAP(bool, outline, wtb.draw_outline);
+ }
+ }
}
-static void widget_scroll(uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int UNUSED(roundboxalign))
+static void widget_scroll(
+ uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int UNUSED(roundboxalign))
{
- rcti rect1;
- double value;
- float fac, size, min;
- int horizontal;
-
- /* calculate slider part */
- value = ui_but_value_get(but);
-
- size = (but->softmax + but->a1 - but->softmin);
- size = max_ff(size, 2.0f);
-
- /* position */
- rect1 = *rect;
-
- /* determine horizontal/vertical */
- horizontal = (BLI_rcti_size_x(rect) > BLI_rcti_size_y(rect));
-
- if (horizontal) {
- fac = BLI_rcti_size_x(rect) / size;
- rect1.xmin = rect1.xmin + ceilf(fac * ((float)value - but->softmin));
- rect1.xmax = rect1.xmin + ceilf(fac * (but->a1 - but->softmin));
-
- /* ensure minimium size */
- min = BLI_rcti_size_y(rect);
-
- if (BLI_rcti_size_x(&rect1) < min) {
- rect1.xmax = rect1.xmin + min;
-
- if (rect1.xmax > rect->xmax) {
- rect1.xmax = rect->xmax;
- rect1.xmin = max_ii(rect1.xmax - min, rect->xmin);
- }
- }
- }
- else {
- fac = BLI_rcti_size_y(rect) / size;
- rect1.ymax = rect1.ymax - ceilf(fac * ((float)value - but->softmin));
- rect1.ymin = rect1.ymax - ceilf(fac * (but->a1 - but->softmin));
-
- /* ensure minimium size */
- min = BLI_rcti_size_x(rect);
-
- if (BLI_rcti_size_y(&rect1) < min) {
- rect1.ymax = rect1.ymin + min;
-
- if (rect1.ymax > rect->ymax) {
- rect1.ymax = rect->ymax;
- rect1.ymin = max_ii(rect1.ymax - min, rect->ymin);
- }
- }
- }
-
- if (state & UI_SELECT) {
- state = UI_SCROLL_PRESSED;
- }
- else {
- state = 0;
- }
- UI_draw_widget_scroll(wcol, rect, &rect1, state);
+ rcti rect1;
+ double value;
+ float fac, size, min;
+ int horizontal;
+
+ /* calculate slider part */
+ value = ui_but_value_get(but);
+
+ size = (but->softmax + but->a1 - but->softmin);
+ size = max_ff(size, 2.0f);
+
+ /* position */
+ rect1 = *rect;
+
+ /* determine horizontal/vertical */
+ horizontal = (BLI_rcti_size_x(rect) > BLI_rcti_size_y(rect));
+
+ if (horizontal) {
+ fac = BLI_rcti_size_x(rect) / size;
+ rect1.xmin = rect1.xmin + ceilf(fac * ((float)value - but->softmin));
+ rect1.xmax = rect1.xmin + ceilf(fac * (but->a1 - but->softmin));
+
+ /* ensure minimium size */
+ min = BLI_rcti_size_y(rect);
+
+ if (BLI_rcti_size_x(&rect1) < min) {
+ rect1.xmax = rect1.xmin + min;
+
+ if (rect1.xmax > rect->xmax) {
+ rect1.xmax = rect->xmax;
+ rect1.xmin = max_ii(rect1.xmax - min, rect->xmin);
+ }
+ }
+ }
+ else {
+ fac = BLI_rcti_size_y(rect) / size;
+ rect1.ymax = rect1.ymax - ceilf(fac * ((float)value - but->softmin));
+ rect1.ymin = rect1.ymax - ceilf(fac * (but->a1 - but->softmin));
+
+ /* ensure minimium size */
+ min = BLI_rcti_size_x(rect);
+
+ if (BLI_rcti_size_y(&rect1) < min) {
+ rect1.ymax = rect1.ymin + min;
+
+ if (rect1.ymax > rect->ymax) {
+ rect1.ymax = rect->ymax;
+ rect1.ymin = max_ii(rect1.ymax - min, rect->ymin);
+ }
+ }
+ }
+
+ if (state & UI_SELECT) {
+ state = UI_SCROLL_PRESSED;
+ }
+ else {
+ state = 0;
+ }
+ UI_draw_widget_scroll(wcol, rect, &rect1, state);
}
-static void widget_progressbar(uiBut *but, uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
+static void widget_progressbar(
+ uiBut *but, uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
{
- uiWidgetBase wtb, wtb_bar;
- rcti rect_prog = *rect, rect_bar = *rect;
+ uiWidgetBase wtb, wtb_bar;
+ rcti rect_prog = *rect, rect_bar = *rect;
- widget_init(&wtb);
- widget_init(&wtb_bar);
+ widget_init(&wtb);
+ widget_init(&wtb_bar);
- /* round corners */
- float value = but->a1;
- float offs = wcol->roundness * BLI_rcti_size_y(&rect_prog);
- float w = value * BLI_rcti_size_x(&rect_prog);
+ /* round corners */
+ float value = but->a1;
+ float offs = wcol->roundness * BLI_rcti_size_y(&rect_prog);
+ float w = value * BLI_rcti_size_x(&rect_prog);
- /* ensure minimium size */
- w = MAX2(w, offs);
+ /* ensure minimium size */
+ w = MAX2(w, offs);
- rect_bar.xmax = rect_bar.xmin + w;
+ rect_bar.xmax = rect_bar.xmin + w;
- round_box_edges(&wtb, roundboxalign, &rect_prog, offs);
- round_box_edges(&wtb_bar, roundboxalign, &rect_bar, offs);
+ round_box_edges(&wtb, roundboxalign, &rect_prog, offs);
+ round_box_edges(&wtb_bar, roundboxalign, &rect_bar, offs);
- wtb.draw_outline = true;
- widgetbase_draw(&wtb, wcol);
+ wtb.draw_outline = true;
+ widgetbase_draw(&wtb, wcol);
- /* "slider" bar color */
- copy_v3_v3_char(wcol->inner, wcol->item);
- widgetbase_draw(&wtb_bar, wcol);
+ /* "slider" bar color */
+ copy_v3_v3_char(wcol->inner, wcol->item);
+ widgetbase_draw(&wtb_bar, wcol);
- /* raise text a bit */
- rect->xmin += (BLI_rcti_size_x(&rect_prog) / 2);
- rect->xmax += (BLI_rcti_size_x(&rect_prog) / 2);
+ /* raise text a bit */
+ rect->xmin += (BLI_rcti_size_x(&rect_prog) / 2);
+ rect->xmax += (BLI_rcti_size_x(&rect_prog) / 2);
}
-static void widget_numslider(uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
+static void widget_numslider(
+ uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
{
- uiWidgetBase wtb, wtb1;
- rcti rect1;
- float offs, toffs;
- char outline[3];
-
- widget_init(&wtb);
- widget_init(&wtb1);
-
- /* Backdrop first. */
- offs = wcol->roundness * BLI_rcti_size_y(rect);
- toffs = offs * 0.75f;
- round_box_edges(&wtb, roundboxalign, rect, offs);
-
- wtb.draw_outline = false;
- widgetbase_draw(&wtb, wcol);
-
- /* Draw slider part only when not in text editing. */
- if (!(state & UI_STATE_TEXT_INPUT)) {
- int roundboxalign_slider = roundboxalign;
-
- copy_v3_v3_char(outline, wcol->outline);
- copy_v3_v3_char(wcol->outline, wcol->item);
- copy_v3_v3_char(wcol->inner, wcol->item);
-
- if (!(state & UI_SELECT)) {
- SWAP(short, wcol->shadetop, wcol->shadedown);
- }
-
- rect1 = *rect;
- float factor, factor_ui;
- float factor_discard = 1.0f; /* No discard. */
- float value = (float)ui_but_value_get(but);
-
- if (but->rnaprop && (RNA_property_subtype(but->rnaprop) == PROP_PERCENTAGE)) {
- factor = value / but->softmax;
- }
- else {
- factor = (value - but->softmin) / (but->softmax - but->softmin);
- }
-
- float width = (float)BLI_rcti_size_x(rect);
- factor_ui = factor * width;
-
- if (factor_ui <= offs) {
- /* Left part only. */
- roundboxalign_slider &= ~(UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT);
- rect1.xmax = rect1.xmin + offs;
- factor_discard = factor_ui / offs;
- }
- else if (factor_ui <= width - offs) {
- /* Left part + middle part. */
- roundboxalign_slider &= ~(UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT);
- rect1.xmax = rect1.xmin + factor_ui;
- }
- else {
- /* Left part + middle part + right part. */
- factor_discard = factor;
- }
-
- round_box_edges(&wtb1, roundboxalign_slider, &rect1, offs);
- wtb1.draw_outline = false;
- widgetbase_set_uniform_discard_factor(&wtb1, factor_discard);
- widgetbase_draw(&wtb1, wcol);
-
- copy_v3_v3_char(wcol->outline, outline);
-
- if (!(state & UI_SELECT)) {
- SWAP(short, wcol->shadetop, wcol->shadedown);
- }
- }
-
- /* Outline. */
- wtb.draw_outline = true;
- wtb.draw_inner = false;
- widgetbase_draw(&wtb, wcol);
-
- /* Add space at either side of the button so text aligns with numbuttons
- * (which have arrow icons). */
- if (!(state & UI_STATE_TEXT_INPUT)) {
- rect->xmax -= toffs;
- rect->xmin += toffs;
- }
+ uiWidgetBase wtb, wtb1;
+ rcti rect1;
+ float offs, toffs;
+ char outline[3];
+
+ widget_init(&wtb);
+ widget_init(&wtb1);
+
+ /* Backdrop first. */
+ offs = wcol->roundness * BLI_rcti_size_y(rect);
+ toffs = offs * 0.75f;
+ round_box_edges(&wtb, roundboxalign, rect, offs);
+
+ wtb.draw_outline = false;
+ widgetbase_draw(&wtb, wcol);
+
+ /* Draw slider part only when not in text editing. */
+ if (!(state & UI_STATE_TEXT_INPUT)) {
+ int roundboxalign_slider = roundboxalign;
+
+ copy_v3_v3_char(outline, wcol->outline);
+ copy_v3_v3_char(wcol->outline, wcol->item);
+ copy_v3_v3_char(wcol->inner, wcol->item);
+
+ if (!(state & UI_SELECT)) {
+ SWAP(short, wcol->shadetop, wcol->shadedown);
+ }
+
+ rect1 = *rect;
+ float factor, factor_ui;
+ float factor_discard = 1.0f; /* No discard. */
+ float value = (float)ui_but_value_get(but);
+
+ if (but->rnaprop && (RNA_property_subtype(but->rnaprop) == PROP_PERCENTAGE)) {
+ factor = value / but->softmax;
+ }
+ else {
+ factor = (value - but->softmin) / (but->softmax - but->softmin);
+ }
+
+ float width = (float)BLI_rcti_size_x(rect);
+ factor_ui = factor * width;
+
+ if (factor_ui <= offs) {
+ /* Left part only. */
+ roundboxalign_slider &= ~(UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT);
+ rect1.xmax = rect1.xmin + offs;
+ factor_discard = factor_ui / offs;
+ }
+ else if (factor_ui <= width - offs) {
+ /* Left part + middle part. */
+ roundboxalign_slider &= ~(UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT);
+ rect1.xmax = rect1.xmin + factor_ui;
+ }
+ else {
+ /* Left part + middle part + right part. */
+ factor_discard = factor;
+ }
+
+ round_box_edges(&wtb1, roundboxalign_slider, &rect1, offs);
+ wtb1.draw_outline = false;
+ widgetbase_set_uniform_discard_factor(&wtb1, factor_discard);
+ widgetbase_draw(&wtb1, wcol);
+
+ copy_v3_v3_char(wcol->outline, outline);
+
+ if (!(state & UI_SELECT)) {
+ SWAP(short, wcol->shadetop, wcol->shadedown);
+ }
+ }
+
+ /* Outline. */
+ wtb.draw_outline = true;
+ wtb.draw_inner = false;
+ widgetbase_draw(&wtb, wcol);
+
+ /* Add space at either side of the button so text aligns with numbuttons
+ * (which have arrow icons). */
+ if (!(state & UI_STATE_TEXT_INPUT)) {
+ rect->xmax -= toffs;
+ rect->xmin += toffs;
+ }
}
/* I think 3 is sufficient border to indicate keyed status */
#define SWATCH_KEYED_BORDER 3
-static void widget_swatch(uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
+static void widget_swatch(
+ uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
{
- uiWidgetBase wtb;
- float rad, col[4];
-
- col[3] = 1.0f;
-
- if (but->rnaprop) {
- BLI_assert(but->rnaindex == -1);
-
- if (RNA_property_array_length(&but->rnapoin, but->rnaprop) == 4) {
- col[3] = RNA_property_float_get_index(&but->rnapoin, but->rnaprop, 3);
- }
- }
-
- widget_init(&wtb);
-
- rad = wcol->roundness * U.widget_unit;
- round_box_edges(&wtb, roundboxalign, rect, rad);
-
- ui_but_v3_get(but, col);
-
- if ((state & (UI_BUT_ANIMATED | UI_BUT_ANIMATED_KEY | UI_BUT_DRIVEN | UI_BUT_OVERRIDEN | UI_BUT_REDALERT)) ||
- (but->drawflag & UI_BUT_ANIMATED_CHANGED))
- {
- /* draw based on state - color for keyed etc */
- widgetbase_draw(&wtb, wcol);
-
- /* inset to draw swatch color */
- rect->xmin += SWATCH_KEYED_BORDER;
- rect->xmax -= SWATCH_KEYED_BORDER;
- rect->ymin += SWATCH_KEYED_BORDER;
- rect->ymax -= SWATCH_KEYED_BORDER;
-
- round_box_edges(&wtb, roundboxalign, rect, rad);
- }
-
- if (!ui_but_is_color_gamma(but)) {
- ui_block_cm_to_display_space_v3(but->block, col);
- }
-
- rgba_float_to_uchar((uchar *)wcol->inner, col);
- const bool show_alpha_checkers = (wcol->inner[3] < 255);
-
- wcol->shaded = 0;
-
- if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE)) {
- /* Now we reduce alpha of the inner color (i.e. the color shown)
- * so that this setting can look grayed out, while retaining
- * the checkboard (for transparent values). This is needed
- * here as the effects of ui_widget_color_disabled() are overwritten.
- */
- wcol->inner[3] /= 2;
- }
-
- widgetbase_draw_ex(&wtb, wcol, show_alpha_checkers);
- if (but->a1 == UI_PALETTE_COLOR && ((Palette *)but->rnapoin.id.data)->active_color == (int)but->a2) {
- float width = rect->xmax - rect->xmin;
- float height = rect->ymax - rect->ymin;
- /* find color luminance and change it slightly */
- float bw = rgb_to_grayscale(col);
-
- bw += (bw < 0.5f) ? 0.5f : -0.5f;
-
- /* We are drawing on top of widget bases. Flush cache. */
- GPU_blend(true);
- UI_widgetbase_draw_cache_flush();
- GPU_blend(false);
-
- uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
- immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
-
- immUniformColor3f(bw, bw, bw);
- immBegin(GPU_PRIM_TRIS, 3);
- immVertex2f(pos, rect->xmin + 0.1f * width, rect->ymin + 0.9f * height);
- immVertex2f(pos, rect->xmin + 0.1f * width, rect->ymin + 0.5f * height);
- immVertex2f(pos, rect->xmin + 0.5f * width, rect->ymin + 0.9f * height);
- immEnd();
-
- immUnbindProgram();
- }
+ uiWidgetBase wtb;
+ float rad, col[4];
+
+ col[3] = 1.0f;
+
+ if (but->rnaprop) {
+ BLI_assert(but->rnaindex == -1);
+
+ if (RNA_property_array_length(&but->rnapoin, but->rnaprop) == 4) {
+ col[3] = RNA_property_float_get_index(&but->rnapoin, but->rnaprop, 3);
+ }
+ }
+
+ widget_init(&wtb);
+
+ rad = wcol->roundness * U.widget_unit;
+ round_box_edges(&wtb, roundboxalign, rect, rad);
+
+ ui_but_v3_get(but, col);
+
+ if ((state & (UI_BUT_ANIMATED | UI_BUT_ANIMATED_KEY | UI_BUT_DRIVEN | UI_BUT_OVERRIDEN |
+ UI_BUT_REDALERT)) ||
+ (but->drawflag & UI_BUT_ANIMATED_CHANGED)) {
+ /* draw based on state - color for keyed etc */
+ widgetbase_draw(&wtb, wcol);
+
+ /* inset to draw swatch color */
+ rect->xmin += SWATCH_KEYED_BORDER;
+ rect->xmax -= SWATCH_KEYED_BORDER;
+ rect->ymin += SWATCH_KEYED_BORDER;
+ rect->ymax -= SWATCH_KEYED_BORDER;
+
+ round_box_edges(&wtb, roundboxalign, rect, rad);
+ }
+
+ if (!ui_but_is_color_gamma(but)) {
+ ui_block_cm_to_display_space_v3(but->block, col);
+ }
+
+ rgba_float_to_uchar((uchar *)wcol->inner, col);
+ const bool show_alpha_checkers = (wcol->inner[3] < 255);
+
+ wcol->shaded = 0;
+
+ if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE)) {
+ /* Now we reduce alpha of the inner color (i.e. the color shown)
+ * so that this setting can look grayed out, while retaining
+ * the checkboard (for transparent values). This is needed
+ * here as the effects of ui_widget_color_disabled() are overwritten.
+ */
+ wcol->inner[3] /= 2;
+ }
+
+ widgetbase_draw_ex(&wtb, wcol, show_alpha_checkers);
+ if (but->a1 == UI_PALETTE_COLOR &&
+ ((Palette *)but->rnapoin.id.data)->active_color == (int)but->a2) {
+ float width = rect->xmax - rect->xmin;
+ float height = rect->ymax - rect->ymin;
+ /* find color luminance and change it slightly */
+ float bw = rgb_to_grayscale(col);
+
+ bw += (bw < 0.5f) ? 0.5f : -0.5f;
+
+ /* We are drawing on top of widget bases. Flush cache. */
+ GPU_blend(true);
+ UI_widgetbase_draw_cache_flush();
+ GPU_blend(false);
+
+ uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+
+ immUniformColor3f(bw, bw, bw);
+ immBegin(GPU_PRIM_TRIS, 3);
+ immVertex2f(pos, rect->xmin + 0.1f * width, rect->ymin + 0.9f * height);
+ immVertex2f(pos, rect->xmin + 0.1f * width, rect->ymin + 0.5f * height);
+ immVertex2f(pos, rect->xmin + 0.5f * width, rect->ymin + 0.9f * height);
+ immEnd();
+
+ immUnbindProgram();
+ }
}
-static void widget_unitvec(uiBut *but, uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int UNUSED(roundboxalign))
+static void widget_unitvec(
+ uiBut *but, uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int UNUSED(roundboxalign))
{
- ui_draw_but_UNITVEC(but, wcol, rect);
+ ui_draw_but_UNITVEC(but, wcol, rect);
}
-static void widget_icon_has_anim(uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
+static void widget_icon_has_anim(
+ uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
{
- if (state & (UI_BUT_ANIMATED | UI_BUT_ANIMATED_KEY | UI_BUT_DRIVEN | UI_BUT_REDALERT)) {
- uiWidgetBase wtb;
- float rad;
-
- widget_init(&wtb);
- wtb.draw_outline = false;
-
- rad = wcol->roundness * BLI_rcti_size_y(rect);
- round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
- widgetbase_draw(&wtb, wcol);
- }
- else if (but->type == UI_BTYPE_NUM) {
- /* Draw number buttons still with left/right
- * triangles when field is not embossed */
- widget_numbut_embossn(but, wcol, rect, state, roundboxalign);
- }
+ if (state & (UI_BUT_ANIMATED | UI_BUT_ANIMATED_KEY | UI_BUT_DRIVEN | UI_BUT_REDALERT)) {
+ uiWidgetBase wtb;
+ float rad;
+
+ widget_init(&wtb);
+ wtb.draw_outline = false;
+
+ rad = wcol->roundness * BLI_rcti_size_y(rect);
+ round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
+ widgetbase_draw(&wtb, wcol);
+ }
+ else if (but->type == UI_BTYPE_NUM) {
+ /* Draw number buttons still with left/right
+ * triangles when field is not embossed */
+ widget_numbut_embossn(but, wcol, rect, state, roundboxalign);
+ }
}
-
static void widget_textbut(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
{
- uiWidgetBase wtb;
- float rad;
+ uiWidgetBase wtb;
+ float rad;
- if (state & UI_SELECT) {
- SWAP(short, wcol->shadetop, wcol->shadedown);
- }
+ if (state & UI_SELECT) {
+ SWAP(short, wcol->shadetop, wcol->shadedown);
+ }
- widget_init(&wtb);
+ widget_init(&wtb);
- rad = wcol->roundness * U.widget_unit;
- round_box_edges(&wtb, roundboxalign, rect, rad);
+ rad = wcol->roundness * U.widget_unit;
+ round_box_edges(&wtb, roundboxalign, rect, rad);
- widgetbase_draw(&wtb, wcol);
+ widgetbase_draw(&wtb, wcol);
}
-
static void widget_menubut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
{
- uiWidgetBase wtb;
- float rad;
+ uiWidgetBase wtb;
+ float rad;
- widget_init(&wtb);
+ widget_init(&wtb);
- rad = wcol->roundness * U.widget_unit;
- round_box_edges(&wtb, roundboxalign, rect, rad);
+ rad = wcol->roundness * U.widget_unit;
+ round_box_edges(&wtb, roundboxalign, rect, rad);
- /* decoration */
- shape_preset_trias_from_rect_menu(&wtb.tria1, rect);
- /* copy size and center to 2nd tria */
- wtb.tria2 = wtb.tria1;
+ /* decoration */
+ shape_preset_trias_from_rect_menu(&wtb.tria1, rect);
+ /* copy size and center to 2nd tria */
+ wtb.tria2 = wtb.tria1;
- widgetbase_draw(&wtb, wcol);
+ widgetbase_draw(&wtb, wcol);
- /* text space, arrows are about 0.6 height of button */
- rect->xmax -= (6 * BLI_rcti_size_y(rect)) / 10;
+ /* text space, arrows are about 0.6 height of button */
+ rect->xmax -= (6 * BLI_rcti_size_y(rect)) / 10;
}
-static void widget_menuiconbut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
+static void widget_menuiconbut(uiWidgetColors *wcol,
+ rcti *rect,
+ int UNUSED(state),
+ int roundboxalign)
{
- uiWidgetBase wtb;
- float rad;
+ uiWidgetBase wtb;
+ float rad;
- widget_init(&wtb);
+ widget_init(&wtb);
- rad = wcol->roundness * U.widget_unit;
- round_box_edges(&wtb, roundboxalign, rect, rad);
+ rad = wcol->roundness * U.widget_unit;
+ round_box_edges(&wtb, roundboxalign, rect, rad);
- /* decoration */
- widgetbase_draw(&wtb, wcol);
+ /* decoration */
+ widgetbase_draw(&wtb, wcol);
}
static void widget_pulldownbut(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
{
- float back[4];
- UI_GetThemeColor4fv(TH_BACK, back);
-
- if ((state & UI_ACTIVE) || (back[3] < 1.0f)) {
- uiWidgetBase wtb;
- const float rad = wcol->roundness * U.widget_unit;
-
- if (state & UI_ACTIVE) {
- copy_v4_v4_char(wcol->inner, wcol->inner_sel);
- copy_v3_v3_char(wcol->text, wcol->text_sel);
- copy_v3_v3_char(wcol->outline, wcol->inner);
- }
- else {
- wcol->inner[3] *= 1.0f - back[3];
- wcol->outline[3] = 0.0f;
- }
-
- widget_init(&wtb);
-
- /* half rounded */
- round_box_edges(&wtb, roundboxalign, rect, rad);
-
- widgetbase_draw(&wtb, wcol);
- }
+ float back[4];
+ UI_GetThemeColor4fv(TH_BACK, back);
+
+ if ((state & UI_ACTIVE) || (back[3] < 1.0f)) {
+ uiWidgetBase wtb;
+ const float rad = wcol->roundness * U.widget_unit;
+
+ if (state & UI_ACTIVE) {
+ copy_v4_v4_char(wcol->inner, wcol->inner_sel);
+ copy_v3_v3_char(wcol->text, wcol->text_sel);
+ copy_v3_v3_char(wcol->outline, wcol->inner);
+ }
+ else {
+ wcol->inner[3] *= 1.0f - back[3];
+ wcol->outline[3] = 0.0f;
+ }
+
+ widget_init(&wtb);
+
+ /* half rounded */
+ round_box_edges(&wtb, roundboxalign, rect, rad);
+
+ widgetbase_draw(&wtb, wcol);
+ }
}
-static void widget_menu_itembut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int UNUSED(roundboxalign))
+static void widget_menu_itembut(uiWidgetColors *wcol,
+ rcti *rect,
+ int UNUSED(state),
+ int UNUSED(roundboxalign))
{
- uiWidgetBase wtb;
+ uiWidgetBase wtb;
- widget_init(&wtb);
+ widget_init(&wtb);
- /* not rounded, no outline */
- wtb.draw_outline = false;
- round_box_edges(&wtb, 0, rect, 0.0f);
+ /* not rounded, no outline */
+ wtb.draw_outline = false;
+ round_box_edges(&wtb, 0, rect, 0.0f);
- widgetbase_draw(&wtb, wcol);
+ widgetbase_draw(&wtb, wcol);
}
-static void widget_menu_radial_itembut(uiBut *but, uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int UNUSED(roundboxalign))
+static void widget_menu_radial_itembut(
+ uiBut *but, uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int UNUSED(roundboxalign))
{
- uiWidgetBase wtb;
- float rad;
- float fac = but->block->pie_data.alphafac;
+ uiWidgetBase wtb;
+ float rad;
+ float fac = but->block->pie_data.alphafac;
- widget_init(&wtb);
+ widget_init(&wtb);
- wtb.draw_emboss = false;
+ wtb.draw_emboss = false;
- rad = wcol->roundness * BLI_rcti_size_y(rect);
- round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
+ rad = wcol->roundness * BLI_rcti_size_y(rect);
+ round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
- wcol->inner[3] *= fac;
- wcol->inner_sel[3] *= fac;
- wcol->item[3] *= fac;
- wcol->text[3] *= fac;
- wcol->text_sel[3] *= fac;
- wcol->outline[3] *= fac;
+ wcol->inner[3] *= fac;
+ wcol->inner_sel[3] *= fac;
+ wcol->item[3] *= fac;
+ wcol->text[3] *= fac;
+ wcol->text_sel[3] *= fac;
+ wcol->outline[3] *= fac;
- widgetbase_draw(&wtb, wcol);
+ widgetbase_draw(&wtb, wcol);
}
-static void widget_list_itembut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int UNUSED(roundboxalign))
+static void widget_list_itembut(uiWidgetColors *wcol,
+ rcti *rect,
+ int UNUSED(state),
+ int UNUSED(roundboxalign))
{
- uiWidgetBase wtb;
- float rad;
+ uiWidgetBase wtb;
+ float rad;
- widget_init(&wtb);
+ widget_init(&wtb);
- /* no outline */
- wtb.draw_outline = false;
- rad = wcol->roundness * U.widget_unit;
- round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
+ /* no outline */
+ wtb.draw_outline = false;
+ rad = wcol->roundness * U.widget_unit;
+ round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
- widgetbase_draw(&wtb, wcol);
+ widgetbase_draw(&wtb, wcol);
}
-static void widget_optionbut(uiWidgetColors *wcol, rcti *rect, int state, int UNUSED(roundboxalign))
+static void widget_optionbut(uiWidgetColors *wcol,
+ rcti *rect,
+ int state,
+ int UNUSED(roundboxalign))
{
- bool text_before_widget = (state & UI_STATE_TEXT_BEFORE_WIDGET);
- uiWidgetBase wtb;
- rcti recttemp = *rect;
- float rad;
- int delta;
-
- widget_init(&wtb);
-
- /* square */
- if (text_before_widget) {
- recttemp.xmin = recttemp.xmax - BLI_rcti_size_y(&recttemp);
- }
- else {
- recttemp.xmax = recttemp.xmin + BLI_rcti_size_y(&recttemp);
- }
-
- /* smaller */
- delta = 1 + BLI_rcti_size_y(&recttemp) / 8;
- recttemp.xmin += delta;
- recttemp.ymin += delta;
- recttemp.xmax -= delta;
- recttemp.ymax -= delta;
-
- rad = wcol->roundness * BLI_rcti_size_y(&recttemp);
- round_box_edges(&wtb, UI_CNR_ALL, &recttemp, rad);
-
- /* decoration */
- if (state & UI_SELECT) {
- shape_preset_trias_from_rect_checkmark(&wtb.tria1, &recttemp);
- }
-
- widgetbase_draw(&wtb, wcol);
-
- /* text space */
- const float offset = BLI_rcti_size_y(rect) * 0.7 + delta;
- if (text_before_widget) {
- rect->xmax -= offset;
- }
- else {
- rect->xmin += offset;
- }
+ bool text_before_widget = (state & UI_STATE_TEXT_BEFORE_WIDGET);
+ uiWidgetBase wtb;
+ rcti recttemp = *rect;
+ float rad;
+ int delta;
+
+ widget_init(&wtb);
+
+ /* square */
+ if (text_before_widget) {
+ recttemp.xmin = recttemp.xmax - BLI_rcti_size_y(&recttemp);
+ }
+ else {
+ recttemp.xmax = recttemp.xmin + BLI_rcti_size_y(&recttemp);
+ }
+
+ /* smaller */
+ delta = 1 + BLI_rcti_size_y(&recttemp) / 8;
+ recttemp.xmin += delta;
+ recttemp.ymin += delta;
+ recttemp.xmax -= delta;
+ recttemp.ymax -= delta;
+
+ rad = wcol->roundness * BLI_rcti_size_y(&recttemp);
+ round_box_edges(&wtb, UI_CNR_ALL, &recttemp, rad);
+
+ /* decoration */
+ if (state & UI_SELECT) {
+ shape_preset_trias_from_rect_checkmark(&wtb.tria1, &recttemp);
+ }
+
+ widgetbase_draw(&wtb, wcol);
+
+ /* text space */
+ const float offset = BLI_rcti_size_y(rect) * 0.7 + delta;
+ if (text_before_widget) {
+ rect->xmax -= offset;
+ }
+ else {
+ rect->xmin += offset;
+ }
}
/* labels use Editor theme colors for text */
static void widget_state_label(uiWidgetType *wt, int state, int drawflag)
{
- if (state & UI_BUT_LIST_ITEM) {
- /* Override default label theme's colors. */
- bTheme *btheme = UI_GetTheme();
- wt->wcol_theme = &btheme->tui.wcol_list_item;
- /* call this for option button */
- widget_state(wt, state, drawflag);
- }
- else {
- /* call this for option button */
- widget_state(wt, state, drawflag);
- if (state & UI_SELECT) {
- UI_GetThemeColor3ubv(TH_TEXT_HI, (uchar *)wt->wcol.text);
- }
- else {
- UI_GetThemeColor3ubv(TH_TEXT, (uchar *)wt->wcol.text);
- }
- }
-
- if (state & UI_BUT_REDALERT) {
- char red[4] = {255, 0, 0};
- widget_state_blend(wt->wcol.text, red, 0.4f);
- }
+ if (state & UI_BUT_LIST_ITEM) {
+ /* Override default label theme's colors. */
+ bTheme *btheme = UI_GetTheme();
+ wt->wcol_theme = &btheme->tui.wcol_list_item;
+ /* call this for option button */
+ widget_state(wt, state, drawflag);
+ }
+ else {
+ /* call this for option button */
+ widget_state(wt, state, drawflag);
+ if (state & UI_SELECT) {
+ UI_GetThemeColor3ubv(TH_TEXT_HI, (uchar *)wt->wcol.text);
+ }
+ else {
+ UI_GetThemeColor3ubv(TH_TEXT, (uchar *)wt->wcol.text);
+ }
+ }
+
+ if (state & UI_BUT_REDALERT) {
+ char red[4] = {255, 0, 0};
+ widget_state_blend(wt->wcol.text, red, 0.4f);
+ }
}
static void widget_radiobut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
{
- uiWidgetBase wtb;
- float rad;
+ uiWidgetBase wtb;
+ float rad;
- widget_init(&wtb);
+ widget_init(&wtb);
- rad = wcol->roundness * U.widget_unit;
- round_box_edges(&wtb, roundboxalign, rect, rad);
+ rad = wcol->roundness * U.widget_unit;
+ round_box_edges(&wtb, roundboxalign, rect, rad);
- widgetbase_draw(&wtb, wcol);
+ widgetbase_draw(&wtb, wcol);
}
-static void widget_box(uiBut *but, uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
+static void widget_box(
+ uiBut *but, uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
{
- uiWidgetBase wtb;
- float rad;
- char old_col[3];
+ uiWidgetBase wtb;
+ float rad;
+ char old_col[3];
- widget_init(&wtb);
+ widget_init(&wtb);
- copy_v3_v3_char(old_col, wcol->inner);
+ copy_v3_v3_char(old_col, wcol->inner);
- /* abuse but->hsv - if it's non-zero, use this color as the box's background */
- if (but->col[3]) {
- wcol->inner[0] = but->col[0];
- wcol->inner[1] = but->col[1];
- wcol->inner[2] = but->col[2];
- wcol->inner[3] = but->col[3];
- }
+ /* abuse but->hsv - if it's non-zero, use this color as the box's background */
+ if (but->col[3]) {
+ wcol->inner[0] = but->col[0];
+ wcol->inner[1] = but->col[1];
+ wcol->inner[2] = but->col[2];
+ wcol->inner[3] = but->col[3];
+ }
- rad = wcol->roundness * U.widget_unit;
- round_box_edges(&wtb, roundboxalign, rect, rad);
+ rad = wcol->roundness * U.widget_unit;
+ round_box_edges(&wtb, roundboxalign, rect, rad);
- widgetbase_draw(&wtb, wcol);
+ widgetbase_draw(&wtb, wcol);
- copy_v3_v3_char(wcol->inner, old_col);
+ copy_v3_v3_char(wcol->inner, old_col);
}
static void widget_but(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
{
- uiWidgetBase wtb;
- float rad;
+ uiWidgetBase wtb;
+ float rad;
- widget_init(&wtb);
+ widget_init(&wtb);
- rad = wcol->roundness * U.widget_unit;
- round_box_edges(&wtb, roundboxalign, rect, rad);
+ rad = wcol->roundness * U.widget_unit;
+ round_box_edges(&wtb, roundboxalign, rect, rad);
- widgetbase_draw(&wtb, wcol);
+ widgetbase_draw(&wtb, wcol);
}
#if 0
static void widget_roundbut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
{
- uiWidgetBase wtb;
- const float rad = wcol->roundness * U.widget_unit;
+ uiWidgetBase wtb;
+ const float rad = wcol->roundness * U.widget_unit;
- widget_init(&wtb);
+ widget_init(&wtb);
- /* half rounded */
- round_box_edges(&wtb, roundboxalign, rect, rad);
+ /* half rounded */
+ round_box_edges(&wtb, roundboxalign, rect, rad);
- widgetbase_draw(&wtb, wcol);
+ widgetbase_draw(&wtb, wcol);
}
#endif
static void widget_roundbut_exec(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
{
- uiWidgetBase wtb;
- const float rad = wcol->roundness * U.widget_unit;
+ uiWidgetBase wtb;
+ const float rad = wcol->roundness * U.widget_unit;
- widget_init(&wtb);
+ widget_init(&wtb);
- if (state & UI_STATE_HOLD_ACTION) {
- /* Show that keeping pressed performs another action (typically a menu). */
- shape_preset_init_hold_action(&wtb.tria1, rect, 0.75f, 'r');
- }
+ if (state & UI_STATE_HOLD_ACTION) {
+ /* Show that keeping pressed performs another action (typically a menu). */
+ shape_preset_init_hold_action(&wtb.tria1, rect, 0.75f, 'r');
+ }
- /* half rounded */
- round_box_edges(&wtb, roundboxalign, rect, rad);
+ /* half rounded */
+ round_box_edges(&wtb, roundboxalign, rect, rad);
- widgetbase_draw(&wtb, wcol);
+ widgetbase_draw(&wtb, wcol);
}
static void widget_tab(uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
{
- const float rad = wcol->roundness * U.widget_unit;
- const bool is_active = (state & UI_SELECT);
+ const float rad = wcol->roundness * U.widget_unit;
+ const bool is_active = (state & UI_SELECT);
-/* Draw shaded outline - Disabled for now,
+ /* Draw shaded outline - Disabled for now,
* seems incorrect and also looks nicer without it imho ;) */
-//#define USE_TAB_SHADED_HIGHLIGHT
+ //#define USE_TAB_SHADED_HIGHLIGHT
- uiWidgetBase wtb;
- uchar theme_col_tab_highlight[3];
+ uiWidgetBase wtb;
+ uchar theme_col_tab_highlight[3];
#ifdef USE_TAB_SHADED_HIGHLIGHT
- /* create outline highlight colors */
- if (is_active) {
- interp_v3_v3v3_uchar(theme_col_tab_highlight, (uchar *)wcol->inner_sel,
- (uchar *)wcol->outline, 0.2f);
- }
- else {
- interp_v3_v3v3_uchar(theme_col_tab_highlight, (uchar *)wcol->inner,
- (uchar *)wcol->outline, 0.12f);
- }
+ /* create outline highlight colors */
+ if (is_active) {
+ interp_v3_v3v3_uchar(
+ theme_col_tab_highlight, (uchar *)wcol->inner_sel, (uchar *)wcol->outline, 0.2f);
+ }
+ else {
+ interp_v3_v3v3_uchar(
+ theme_col_tab_highlight, (uchar *)wcol->inner, (uchar *)wcol->outline, 0.12f);
+ }
#endif
- widget_init(&wtb);
+ widget_init(&wtb);
- /* half rounded */
- round_box_edges(&wtb, roundboxalign, rect, rad);
+ /* half rounded */
+ round_box_edges(&wtb, roundboxalign, rect, rad);
- /* draw inner */
+ /* draw inner */
#ifdef USE_TAB_SHADED_HIGHLIGHT
- wtb.draw_outline = 0;
+ wtb.draw_outline = 0;
#endif
- widgetbase_draw(&wtb, wcol);
+ widgetbase_draw(&wtb, wcol);
- /* We are drawing on top of widget bases. Flush cache. */
- GPU_blend(true);
- UI_widgetbase_draw_cache_flush();
- GPU_blend(false);
+ /* We are drawing on top of widget bases. Flush cache. */
+ GPU_blend(true);
+ UI_widgetbase_draw_cache_flush();
+ GPU_blend(false);
#ifdef USE_TAB_SHADED_HIGHLIGHT
- /* draw outline (3d look) */
- ui_draw_but_TAB_outline(rect, rad, theme_col_tab_highlight, (uchar *)wcol->inner);
+ /* draw outline (3d look) */
+ ui_draw_but_TAB_outline(rect, rad, theme_col_tab_highlight, (uchar *)wcol->inner);
#endif
#ifndef USE_TAB_SHADED_HIGHLIGHT
- UNUSED_VARS(is_active, theme_col_tab_highlight);
+ UNUSED_VARS(is_active, theme_col_tab_highlight);
#endif
}
static void widget_draw_extra_mask(const bContext *C, uiBut *but, uiWidgetType *wt, rcti *rect)
{
- bTheme *btheme = UI_GetTheme();
- uiWidgetColors *wcol = &btheme->tui.wcol_radio;
- uiWidgetBase wtb;
- const float rad = wcol->roundness * U.widget_unit;
- uchar col[4];
+ bTheme *btheme = UI_GetTheme();
+ uiWidgetColors *wcol = &btheme->tui.wcol_radio;
+ uiWidgetBase wtb;
+ const float rad = wcol->roundness * U.widget_unit;
+ uchar col[4];
- /* state copy! */
- wt->wcol = *(wt->wcol_theme);
+ /* state copy! */
+ wt->wcol = *(wt->wcol_theme);
- widget_init(&wtb);
+ widget_init(&wtb);
- if (but->block->drawextra) {
- /* note: drawextra can change rect +1 or -1, to match round errors of existing previews */
- but->block->drawextra(C, but->poin, but->block->drawextra_arg1, but->block->drawextra_arg2, rect);
+ if (but->block->drawextra) {
+ /* note: drawextra can change rect +1 or -1, to match round errors of existing previews */
+ but->block->drawextra(
+ C, but->poin, but->block->drawextra_arg1, but->block->drawextra_arg2, rect);
- uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
- immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+ uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
- /* make mask to draw over image */
- UI_GetThemeColor3ubv(TH_BACK, col);
- immUniformColor3ubv(col);
+ /* make mask to draw over image */
+ UI_GetThemeColor3ubv(TH_BACK, col);
+ immUniformColor3ubv(col);
- round_box__edges(&wtb, UI_CNR_ALL, rect, 0.0f, rad);
- widgetbase_outline(&wtb, pos);
+ round_box__edges(&wtb, UI_CNR_ALL, rect, 0.0f, rad);
+ widgetbase_outline(&wtb, pos);
- immUnbindProgram();
- }
+ immUnbindProgram();
+ }
- /* outline */
- round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
- wtb.draw_outline = true;
- wtb.draw_inner = false;
- widgetbase_draw(&wtb, &wt->wcol);
+ /* outline */
+ round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
+ wtb.draw_outline = true;
+ wtb.draw_inner = false;
+ widgetbase_draw(&wtb, &wt->wcol);
}
static uiWidgetType *widget_type(uiWidgetTypeEnum type)
{
- bTheme *btheme = UI_GetTheme();
- static uiWidgetType wt;
-
- /* defaults */
- wt.wcol_theme = &btheme->tui.wcol_regular;
- wt.wcol_state = &btheme->tui.wcol_state;
- wt.state = widget_state;
- wt.draw = widget_but;
- wt.custom = NULL;
- wt.text = widget_draw_text_icon;
-
- switch (type) {
- case UI_WTYPE_REGULAR:
- break;
-
- case UI_WTYPE_LABEL:
- wt.draw = NULL;
- wt.state = widget_state_label;
- break;
-
- case UI_WTYPE_TOGGLE:
- wt.wcol_theme = &btheme->tui.wcol_toggle;
- break;
-
- case UI_WTYPE_CHECKBOX:
- wt.wcol_theme = &btheme->tui.wcol_option;
- wt.draw = widget_optionbut;
- break;
-
- case UI_WTYPE_RADIO:
- wt.wcol_theme = &btheme->tui.wcol_radio;
- wt.draw = widget_radiobut;
- break;
-
- case UI_WTYPE_NUMBER:
- wt.wcol_theme = &btheme->tui.wcol_num;
- wt.draw = widget_numbut;
- break;
-
- case UI_WTYPE_SLIDER:
- wt.wcol_theme = &btheme->tui.wcol_numslider;
- wt.custom = widget_numslider;
- wt.state = widget_state_numslider;
- break;
-
- case UI_WTYPE_EXEC:
- wt.wcol_theme = &btheme->tui.wcol_tool;
- wt.draw = widget_roundbut_exec;
- break;
-
- case UI_WTYPE_TOOLBAR_ITEM:
- wt.wcol_theme = &btheme->tui.wcol_toolbar_item;
- wt.draw = widget_roundbut_exec;
- break;
-
- case UI_WTYPE_TAB:
- wt.wcol_theme = &btheme->tui.wcol_tab;
- wt.draw = widget_tab;
- break;
-
- case UI_WTYPE_TOOLTIP:
- wt.wcol_theme = &btheme->tui.wcol_tooltip;
- wt.draw = widget_menu_back;
- break;
-
-
- /* strings */
- case UI_WTYPE_NAME:
- wt.wcol_theme = &btheme->tui.wcol_text;
- wt.draw = widget_textbut;
- break;
-
- case UI_WTYPE_NAME_LINK:
- break;
-
- case UI_WTYPE_POINTER_LINK:
- break;
-
- case UI_WTYPE_FILENAME:
- break;
-
-
- /* start menus */
- case UI_WTYPE_MENU_RADIO:
- wt.wcol_theme = &btheme->tui.wcol_menu;
- wt.draw = widget_menubut;
- break;
-
- case UI_WTYPE_MENU_ICON_RADIO:
- case UI_WTYPE_MENU_NODE_LINK:
- wt.wcol_theme = &btheme->tui.wcol_menu;
- wt.draw = widget_menuiconbut;
- break;
-
- case UI_WTYPE_MENU_POINTER_LINK:
- wt.wcol_theme = &btheme->tui.wcol_menu;
- wt.draw = widget_menubut;
- break;
-
- case UI_WTYPE_PULLDOWN:
- wt.wcol_theme = &btheme->tui.wcol_pulldown;
- wt.draw = widget_pulldownbut;
- wt.state = widget_state_pulldown;
- break;
-
- /* in menus */
- case UI_WTYPE_MENU_ITEM:
- wt.wcol_theme = &btheme->tui.wcol_menu_item;
- wt.draw = widget_menu_itembut;
- wt.state = widget_state_menu_item;
- break;
-
- case UI_WTYPE_MENU_BACK:
- wt.wcol_theme = &btheme->tui.wcol_menu_back;
- wt.draw = widget_menu_back;
- break;
-
- /* specials */
- case UI_WTYPE_ICON:
- wt.custom = widget_icon_has_anim;
- break;
-
- case UI_WTYPE_ICON_LABEL:
- /* behave like regular labels (this is simply a label with an icon) */
- wt.state = widget_state_label;
- wt.custom = widget_icon_has_anim;
- break;
-
- case UI_WTYPE_SWATCH:
- wt.custom = widget_swatch;
- break;
-
- case UI_WTYPE_BOX:
- wt.custom = widget_box;
- wt.wcol_theme = &btheme->tui.wcol_box;
- break;
-
- case UI_WTYPE_RGB_PICKER:
- break;
-
- case UI_WTYPE_UNITVEC:
- wt.custom = widget_unitvec;
- break;
-
- case UI_WTYPE_SCROLL:
- wt.wcol_theme = &btheme->tui.wcol_scroll;
- wt.state = widget_state_nothing;
- wt.custom = widget_scroll;
- break;
-
- case UI_WTYPE_LISTITEM:
- wt.wcol_theme = &btheme->tui.wcol_list_item;
- wt.draw = widget_list_itembut;
- break;
-
- case UI_WTYPE_PROGRESSBAR:
- wt.wcol_theme = &btheme->tui.wcol_progress;
- wt.custom = widget_progressbar;
- break;
-
- case UI_WTYPE_MENU_ITEM_RADIAL:
- wt.wcol_theme = &btheme->tui.wcol_pie_menu;
- wt.custom = widget_menu_radial_itembut;
- wt.state = widget_state_pie_menu_item;
- break;
- }
-
- return &wt;
+ bTheme *btheme = UI_GetTheme();
+ static uiWidgetType wt;
+
+ /* defaults */
+ wt.wcol_theme = &btheme->tui.wcol_regular;
+ wt.wcol_state = &btheme->tui.wcol_state;
+ wt.state = widget_state;
+ wt.draw = widget_but;
+ wt.custom = NULL;
+ wt.text = widget_draw_text_icon;
+
+ switch (type) {
+ case UI_WTYPE_REGULAR:
+ break;
+
+ case UI_WTYPE_LABEL:
+ wt.draw = NULL;
+ wt.state = widget_state_label;
+ break;
+
+ case UI_WTYPE_TOGGLE:
+ wt.wcol_theme = &btheme->tui.wcol_toggle;
+ break;
+
+ case UI_WTYPE_CHECKBOX:
+ wt.wcol_theme = &btheme->tui.wcol_option;
+ wt.draw = widget_optionbut;
+ break;
+
+ case UI_WTYPE_RADIO:
+ wt.wcol_theme = &btheme->tui.wcol_radio;
+ wt.draw = widget_radiobut;
+ break;
+
+ case UI_WTYPE_NUMBER:
+ wt.wcol_theme = &btheme->tui.wcol_num;
+ wt.draw = widget_numbut;
+ break;
+
+ case UI_WTYPE_SLIDER:
+ wt.wcol_theme = &btheme->tui.wcol_numslider;
+ wt.custom = widget_numslider;
+ wt.state = widget_state_numslider;
+ break;
+
+ case UI_WTYPE_EXEC:
+ wt.wcol_theme = &btheme->tui.wcol_tool;
+ wt.draw = widget_roundbut_exec;
+ break;
+
+ case UI_WTYPE_TOOLBAR_ITEM:
+ wt.wcol_theme = &btheme->tui.wcol_toolbar_item;
+ wt.draw = widget_roundbut_exec;
+ break;
+
+ case UI_WTYPE_TAB:
+ wt.wcol_theme = &btheme->tui.wcol_tab;
+ wt.draw = widget_tab;
+ break;
+
+ case UI_WTYPE_TOOLTIP:
+ wt.wcol_theme = &btheme->tui.wcol_tooltip;
+ wt.draw = widget_menu_back;
+ break;
+
+ /* strings */
+ case UI_WTYPE_NAME:
+ wt.wcol_theme = &btheme->tui.wcol_text;
+ wt.draw = widget_textbut;
+ break;
+
+ case UI_WTYPE_NAME_LINK:
+ break;
+
+ case UI_WTYPE_POINTER_LINK:
+ break;
+
+ case UI_WTYPE_FILENAME:
+ break;
+
+ /* start menus */
+ case UI_WTYPE_MENU_RADIO:
+ wt.wcol_theme = &btheme->tui.wcol_menu;
+ wt.draw = widget_menubut;
+ break;
+
+ case UI_WTYPE_MENU_ICON_RADIO:
+ case UI_WTYPE_MENU_NODE_LINK:
+ wt.wcol_theme = &btheme->tui.wcol_menu;
+ wt.draw = widget_menuiconbut;
+ break;
+
+ case UI_WTYPE_MENU_POINTER_LINK:
+ wt.wcol_theme = &btheme->tui.wcol_menu;
+ wt.draw = widget_menubut;
+ break;
+
+ case UI_WTYPE_PULLDOWN:
+ wt.wcol_theme = &btheme->tui.wcol_pulldown;
+ wt.draw = widget_pulldownbut;
+ wt.state = widget_state_pulldown;
+ break;
+
+ /* in menus */
+ case UI_WTYPE_MENU_ITEM:
+ wt.wcol_theme = &btheme->tui.wcol_menu_item;
+ wt.draw = widget_menu_itembut;
+ wt.state = widget_state_menu_item;
+ break;
+
+ case UI_WTYPE_MENU_BACK:
+ wt.wcol_theme = &btheme->tui.wcol_menu_back;
+ wt.draw = widget_menu_back;
+ break;
+
+ /* specials */
+ case UI_WTYPE_ICON:
+ wt.custom = widget_icon_has_anim;
+ break;
+
+ case UI_WTYPE_ICON_LABEL:
+ /* behave like regular labels (this is simply a label with an icon) */
+ wt.state = widget_state_label;
+ wt.custom = widget_icon_has_anim;
+ break;
+
+ case UI_WTYPE_SWATCH:
+ wt.custom = widget_swatch;
+ break;
+
+ case UI_WTYPE_BOX:
+ wt.custom = widget_box;
+ wt.wcol_theme = &btheme->tui.wcol_box;
+ break;
+
+ case UI_WTYPE_RGB_PICKER:
+ break;
+
+ case UI_WTYPE_UNITVEC:
+ wt.custom = widget_unitvec;
+ break;
+
+ case UI_WTYPE_SCROLL:
+ wt.wcol_theme = &btheme->tui.wcol_scroll;
+ wt.state = widget_state_nothing;
+ wt.custom = widget_scroll;
+ break;
+
+ case UI_WTYPE_LISTITEM:
+ wt.wcol_theme = &btheme->tui.wcol_list_item;
+ wt.draw = widget_list_itembut;
+ break;
+
+ case UI_WTYPE_PROGRESSBAR:
+ wt.wcol_theme = &btheme->tui.wcol_progress;
+ wt.custom = widget_progressbar;
+ break;
+
+ case UI_WTYPE_MENU_ITEM_RADIAL:
+ wt.wcol_theme = &btheme->tui.wcol_pie_menu;
+ wt.custom = widget_menu_radial_itembut;
+ wt.state = widget_state_pie_menu_item;
+ break;
+ }
+
+ return &wt;
}
-
static int widget_roundbox_set(uiBut *but, rcti *rect)
{
- int roundbox = UI_CNR_ALL;
-
- /* alignment */
- if ((but->drawflag & UI_BUT_ALIGN) && but->type != UI_BTYPE_PULLDOWN) {
-
- /* ui_popup_block_position has this correction too, keep in sync */
- if (but->drawflag & (UI_BUT_ALIGN_TOP | UI_BUT_ALIGN_STITCH_TOP)) {
- rect->ymax += U.pixelsize;
- }
- if (but->drawflag & (UI_BUT_ALIGN_LEFT | UI_BUT_ALIGN_STITCH_LEFT)) {
- rect->xmin -= U.pixelsize;
- }
-
- switch (but->drawflag & UI_BUT_ALIGN) {
- case UI_BUT_ALIGN_TOP:
- roundbox = UI_CNR_BOTTOM_LEFT | UI_CNR_BOTTOM_RIGHT;
- break;
- case UI_BUT_ALIGN_DOWN:
- roundbox = UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT;
- break;
- case UI_BUT_ALIGN_LEFT:
- roundbox = UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT;
- break;
- case UI_BUT_ALIGN_RIGHT:
- roundbox = UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT;
- break;
- case UI_BUT_ALIGN_DOWN | UI_BUT_ALIGN_RIGHT:
- roundbox = UI_CNR_TOP_LEFT;
- break;
- case UI_BUT_ALIGN_DOWN | UI_BUT_ALIGN_LEFT:
- roundbox = UI_CNR_TOP_RIGHT;
- break;
- case UI_BUT_ALIGN_TOP | UI_BUT_ALIGN_RIGHT:
- roundbox = UI_CNR_BOTTOM_LEFT;
- break;
- case UI_BUT_ALIGN_TOP | UI_BUT_ALIGN_LEFT:
- roundbox = UI_CNR_BOTTOM_RIGHT;
- break;
- default:
- roundbox = 0;
- break;
- }
- }
-
- /* align with open menu */
- if (but->active && (but->type != UI_BTYPE_POPOVER)) {
- int direction = ui_but_menu_direction(but);
-
- if (direction == UI_DIR_UP) { roundbox &= ~(UI_CNR_TOP_RIGHT | UI_CNR_TOP_LEFT); }
- else if (direction == UI_DIR_DOWN) { roundbox &= ~(UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT); }
- else if (direction == UI_DIR_LEFT) { roundbox &= ~(UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT); }
- else if (direction == UI_DIR_RIGHT) { roundbox &= ~(UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT); }
- }
-
- return roundbox;
+ int roundbox = UI_CNR_ALL;
+
+ /* alignment */
+ if ((but->drawflag & UI_BUT_ALIGN) && but->type != UI_BTYPE_PULLDOWN) {
+
+ /* ui_popup_block_position has this correction too, keep in sync */
+ if (but->drawflag & (UI_BUT_ALIGN_TOP | UI_BUT_ALIGN_STITCH_TOP)) {
+ rect->ymax += U.pixelsize;
+ }
+ if (but->drawflag & (UI_BUT_ALIGN_LEFT | UI_BUT_ALIGN_STITCH_LEFT)) {
+ rect->xmin -= U.pixelsize;
+ }
+
+ switch (but->drawflag & UI_BUT_ALIGN) {
+ case UI_BUT_ALIGN_TOP:
+ roundbox = UI_CNR_BOTTOM_LEFT | UI_CNR_BOTTOM_RIGHT;
+ break;
+ case UI_BUT_ALIGN_DOWN:
+ roundbox = UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT;
+ break;
+ case UI_BUT_ALIGN_LEFT:
+ roundbox = UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT;
+ break;
+ case UI_BUT_ALIGN_RIGHT:
+ roundbox = UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT;
+ break;
+ case UI_BUT_ALIGN_DOWN | UI_BUT_ALIGN_RIGHT:
+ roundbox = UI_CNR_TOP_LEFT;
+ break;
+ case UI_BUT_ALIGN_DOWN | UI_BUT_ALIGN_LEFT:
+ roundbox = UI_CNR_TOP_RIGHT;
+ break;
+ case UI_BUT_ALIGN_TOP | UI_BUT_ALIGN_RIGHT:
+ roundbox = UI_CNR_BOTTOM_LEFT;
+ break;
+ case UI_BUT_ALIGN_TOP | UI_BUT_ALIGN_LEFT:
+ roundbox = UI_CNR_BOTTOM_RIGHT;
+ break;
+ default:
+ roundbox = 0;
+ break;
+ }
+ }
+
+ /* align with open menu */
+ if (but->active && (but->type != UI_BTYPE_POPOVER)) {
+ int direction = ui_but_menu_direction(but);
+
+ if (direction == UI_DIR_UP) {
+ roundbox &= ~(UI_CNR_TOP_RIGHT | UI_CNR_TOP_LEFT);
+ }
+ else if (direction == UI_DIR_DOWN) {
+ roundbox &= ~(UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT);
+ }
+ else if (direction == UI_DIR_LEFT) {
+ roundbox &= ~(UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT);
+ }
+ else if (direction == UI_DIR_RIGHT) {
+ roundbox &= ~(UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT);
+ }
+ }
+
+ return roundbox;
}
/* -------------------------------------------------------------------- */
@@ -4261,749 +4437,812 @@ static int widget_roundbox_set(uiBut *but, rcti *rect)
/* conversion from old to new buttons, so still messy */
void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rcti *rect)
{
- bTheme *btheme = UI_GetTheme();
- const ThemeUI *tui = &btheme->tui;
- const uiFontStyle *fstyle = &style->widget;
- uiWidgetType *wt = NULL;
+ bTheme *btheme = UI_GetTheme();
+ const ThemeUI *tui = &btheme->tui;
+ const uiFontStyle *fstyle = &style->widget;
+ uiWidgetType *wt = NULL;
#ifdef USE_UI_POPOVER_ONCE
- const rcti rect_orig = *rect;
+ const rcti rect_orig = *rect;
#endif
- /* handle menus separately */
- if (but->dt == UI_EMBOSS_PULLDOWN) {
- switch (but->type) {
- case UI_BTYPE_LABEL:
- widget_draw_text_icon(&style->widgetlabel, &tui->wcol_menu_back, but, rect);
- break;
- case UI_BTYPE_SEPR_LINE:
- ui_draw_separator(rect, &tui->wcol_menu_item);
- break;
- default:
- wt = widget_type(UI_WTYPE_MENU_ITEM);
- break;
- }
- }
- else if (but->dt == UI_EMBOSS_NONE) {
- /* "nothing" */
- switch (but->type) {
- case UI_BTYPE_LABEL:
- wt = widget_type(UI_WTYPE_ICON_LABEL);
- break;
- default:
- wt = widget_type(UI_WTYPE_ICON);
- break;
- }
- }
- else if (but->dt == UI_EMBOSS_RADIAL) {
- wt = widget_type(UI_WTYPE_MENU_ITEM_RADIAL);
- }
- else {
- BLI_assert(but->dt == UI_EMBOSS);
-
- switch (but->type) {
- case UI_BTYPE_LABEL:
- wt = widget_type(UI_WTYPE_LABEL);
- fstyle = &style->widgetlabel;
- if (but->drawflag & UI_BUT_BOX_ITEM) {
- wt->wcol_theme = &tui->wcol_box;
- wt->state = widget_state;
- }
- else if (but->block->theme_style == UI_BLOCK_THEME_STYLE_POPUP) {
- wt->wcol_theme = &tui->wcol_menu_back;
- wt->state = widget_state;
- }
- break;
-
- case UI_BTYPE_SEPR:
- case UI_BTYPE_SEPR_LINE:
- case UI_BTYPE_SEPR_SPACER:
- break;
-
- case UI_BTYPE_BUT:
+ /* handle menus separately */
+ if (but->dt == UI_EMBOSS_PULLDOWN) {
+ switch (but->type) {
+ case UI_BTYPE_LABEL:
+ widget_draw_text_icon(&style->widgetlabel, &tui->wcol_menu_back, but, rect);
+ break;
+ case UI_BTYPE_SEPR_LINE:
+ ui_draw_separator(rect, &tui->wcol_menu_item);
+ break;
+ default:
+ wt = widget_type(UI_WTYPE_MENU_ITEM);
+ break;
+ }
+ }
+ else if (but->dt == UI_EMBOSS_NONE) {
+ /* "nothing" */
+ switch (but->type) {
+ case UI_BTYPE_LABEL:
+ wt = widget_type(UI_WTYPE_ICON_LABEL);
+ break;
+ default:
+ wt = widget_type(UI_WTYPE_ICON);
+ break;
+ }
+ }
+ else if (but->dt == UI_EMBOSS_RADIAL) {
+ wt = widget_type(UI_WTYPE_MENU_ITEM_RADIAL);
+ }
+ else {
+ BLI_assert(but->dt == UI_EMBOSS);
+
+ switch (but->type) {
+ case UI_BTYPE_LABEL:
+ wt = widget_type(UI_WTYPE_LABEL);
+ fstyle = &style->widgetlabel;
+ if (but->drawflag & UI_BUT_BOX_ITEM) {
+ wt->wcol_theme = &tui->wcol_box;
+ wt->state = widget_state;
+ }
+ else if (but->block->theme_style == UI_BLOCK_THEME_STYLE_POPUP) {
+ wt->wcol_theme = &tui->wcol_menu_back;
+ wt->state = widget_state;
+ }
+ break;
+
+ case UI_BTYPE_SEPR:
+ case UI_BTYPE_SEPR_LINE:
+ case UI_BTYPE_SEPR_SPACER:
+ break;
+
+ case UI_BTYPE_BUT:
#ifdef USE_UI_TOOLBAR_HACK
- if (UI_but_is_tool(but)) {
- wt = widget_type(UI_WTYPE_TOOLBAR_ITEM);
- }
- else {
- wt = widget_type(UI_WTYPE_EXEC);
- }
+ if (UI_but_is_tool(but)) {
+ wt = widget_type(UI_WTYPE_TOOLBAR_ITEM);
+ }
+ else {
+ wt = widget_type(UI_WTYPE_EXEC);
+ }
#else
- wt = widget_type(UI_WTYPE_EXEC);
+ wt = widget_type(UI_WTYPE_EXEC);
#endif
- break;
-
- case UI_BTYPE_NUM:
- wt = widget_type(UI_WTYPE_NUMBER);
- break;
-
- case UI_BTYPE_NUM_SLIDER:
- wt = widget_type(UI_WTYPE_SLIDER);
- break;
-
- case UI_BTYPE_ROW:
- wt = widget_type(UI_WTYPE_RADIO);
- break;
-
- case UI_BTYPE_LISTROW:
- wt = widget_type(UI_WTYPE_LISTITEM);
- break;
-
- case UI_BTYPE_TEXT:
- wt = widget_type(UI_WTYPE_NAME);
- break;
-
- case UI_BTYPE_SEARCH_MENU:
- wt = widget_type(UI_WTYPE_NAME);
- if (but->block->theme_style == UI_BLOCK_THEME_STYLE_POPUP) {
- wt->wcol_theme = &btheme->tui.wcol_menu_back;
- }
- break;
-
- case UI_BTYPE_TAB:
- wt = widget_type(UI_WTYPE_TAB);
- break;
-
- case UI_BTYPE_BUT_TOGGLE:
- case UI_BTYPE_TOGGLE:
- case UI_BTYPE_TOGGLE_N:
- wt = widget_type(UI_WTYPE_TOGGLE);
- break;
-
- case UI_BTYPE_CHECKBOX:
- case UI_BTYPE_CHECKBOX_N:
- if (!(but->flag & UI_HAS_ICON)) {
- wt = widget_type(UI_WTYPE_CHECKBOX);
- if ((but->drawflag & (UI_BUT_TEXT_LEFT | UI_BUT_TEXT_RIGHT)) == 0) {
- but->drawflag |= UI_BUT_TEXT_LEFT;
- }
- }
- else {
- wt = widget_type(UI_WTYPE_TOGGLE);
- }
-
- /* option buttons have strings outside, on menus use different colors */
- if (but->block->theme_style == UI_BLOCK_THEME_STYLE_POPUP) {
- wt->state = widget_state_option_menu;
- }
- break;
-
- case UI_BTYPE_MENU:
- case UI_BTYPE_BLOCK:
- case UI_BTYPE_POPOVER:
- if (but->flag & UI_BUT_NODE_LINK) {
- /* new node-link button, not active yet XXX */
- wt = widget_type(UI_WTYPE_MENU_NODE_LINK);
- }
- else {
- /* with menu arrows */
-
- /* we could use a flag for this, but for now just check size,
- * add updown arrows if there is room. */
- if ((!but->str[0] && but->icon && (BLI_rcti_size_x(rect) < BLI_rcti_size_y(rect) + 2)) ||
- /* disable for brushes also */
- (but->flag & UI_BUT_ICON_PREVIEW))
- {
- /* no arrows */
- wt = widget_type(UI_WTYPE_MENU_ICON_RADIO);
- }
- else {
- wt = widget_type(UI_WTYPE_MENU_RADIO);
- }
- }
- break;
-
- case UI_BTYPE_PULLDOWN:
- wt = widget_type(UI_WTYPE_PULLDOWN);
- break;
-
- case UI_BTYPE_BUT_MENU:
- wt = widget_type(UI_WTYPE_MENU_ITEM);
- break;
-
- case UI_BTYPE_COLOR:
- wt = widget_type(UI_WTYPE_SWATCH);
- break;
-
- case UI_BTYPE_ROUNDBOX:
- case UI_BTYPE_LISTBOX:
- wt = widget_type(UI_WTYPE_BOX);
- break;
-
- case UI_BTYPE_EXTRA:
- widget_draw_extra_mask(C, but, widget_type(UI_WTYPE_BOX), rect);
- break;
-
- case UI_BTYPE_HSVCUBE:
- if (ELEM(but->a1, UI_GRAD_V_ALT, UI_GRAD_L_ALT)) {
- /* vertical V slider, uses new widget draw now */
- ui_draw_but_HSV_v(but, rect);
- }
- else { /* other HSV pickers... */
- ui_draw_but_HSVCUBE(but, rect);
- }
- break;
-
- case UI_BTYPE_HSVCIRCLE:
- ui_draw_but_HSVCIRCLE(but, &tui->wcol_regular, rect);
- break;
-
- case UI_BTYPE_COLORBAND:
- ui_draw_but_COLORBAND(but, &tui->wcol_regular, rect);
- break;
-
- case UI_BTYPE_UNITVEC:
- wt = widget_type(UI_WTYPE_UNITVEC);
- break;
-
- case UI_BTYPE_IMAGE:
- ui_draw_but_IMAGE(ar, but, &tui->wcol_regular, rect);
- break;
-
- case UI_BTYPE_HISTOGRAM:
- ui_draw_but_HISTOGRAM(ar, but, &tui->wcol_regular, rect);
- break;
-
- case UI_BTYPE_WAVEFORM:
- ui_draw_but_WAVEFORM(ar, but, &tui->wcol_regular, rect);
- break;
-
- case UI_BTYPE_VECTORSCOPE:
- ui_draw_but_VECTORSCOPE(ar, but, &tui->wcol_regular, rect);
- break;
-
- case UI_BTYPE_CURVE:
- ui_draw_but_CURVE(ar, but, &tui->wcol_regular, rect);
- break;
-
- case UI_BTYPE_PROGRESS_BAR:
- wt = widget_type(UI_WTYPE_PROGRESSBAR);
- fstyle = &style->widgetlabel;
- break;
-
- case UI_BTYPE_SCROLL:
- wt = widget_type(UI_WTYPE_SCROLL);
- break;
-
- case UI_BTYPE_GRIP:
- wt = widget_type(UI_WTYPE_ICON);
- break;
-
- case UI_BTYPE_TRACK_PREVIEW:
- ui_draw_but_TRACKPREVIEW(ar, but, &tui->wcol_regular, rect);
- break;
-
- case UI_BTYPE_NODE_SOCKET:
- ui_draw_but_NODESOCKET(ar, but, &tui->wcol_regular, rect);
- break;
-
- default:
- wt = widget_type(UI_WTYPE_REGULAR);
- break;
- }
- }
-
- if (wt) {
- //rcti disablerect = *rect; /* rect gets clipped smaller for text */
- int roundboxalign, state, drawflag;
- bool disabled = false;
-
- roundboxalign = widget_roundbox_set(but, rect);
-
- /* Mask out flags re-used for local state. */
- state = but->flag & ~UI_STATE_FLAGS_ALL;
- drawflag = but->drawflag;
-
- if (state & UI_SELECT_DRAW) {
- state |= UI_SELECT;
- }
-
- if ((but->editstr) ||
- (UNLIKELY(but->flag & UI_BUT_DRAG_MULTI) && ui_but_drag_multi_edit_get(but)))
- {
- state |= UI_STATE_TEXT_INPUT;
- }
-
- if (but->hold_func) {
- state |= UI_STATE_HOLD_ACTION;
- }
-
- if (state & UI_ACTIVE) {
- if (but->drawflag & UI_BUT_ACTIVE_LEFT) {
- state |= UI_STATE_ACTIVE_LEFT;
- }
- else if (but->drawflag & UI_BUT_ACTIVE_RIGHT) {
- state |= UI_STATE_ACTIVE_RIGHT;
- }
- }
-
- if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE)) {
- if (but->dt != UI_EMBOSS_PULLDOWN) {
- disabled = true;
- }
- }
-
- if (drawflag & UI_BUT_TEXT_RIGHT) {
- state |= UI_STATE_TEXT_BEFORE_WIDGET;
- }
-
- if (disabled) {
- ui_widget_color_disabled(wt);
- }
-
- wt->state(wt, state, drawflag);
- if (wt->custom) {
- wt->custom(but, &wt->wcol, rect, state, roundboxalign);
- }
- else if (wt->draw) {
- wt->draw(&wt->wcol, rect, state, roundboxalign);
- }
-
- if (disabled) {
- GPU_blend(true);
- }
-
- bool show_semi_highlight = false;
+ break;
+
+ case UI_BTYPE_NUM:
+ wt = widget_type(UI_WTYPE_NUMBER);
+ break;
+
+ case UI_BTYPE_NUM_SLIDER:
+ wt = widget_type(UI_WTYPE_SLIDER);
+ break;
+
+ case UI_BTYPE_ROW:
+ wt = widget_type(UI_WTYPE_RADIO);
+ break;
+
+ case UI_BTYPE_LISTROW:
+ wt = widget_type(UI_WTYPE_LISTITEM);
+ break;
+
+ case UI_BTYPE_TEXT:
+ wt = widget_type(UI_WTYPE_NAME);
+ break;
+
+ case UI_BTYPE_SEARCH_MENU:
+ wt = widget_type(UI_WTYPE_NAME);
+ if (but->block->theme_style == UI_BLOCK_THEME_STYLE_POPUP) {
+ wt->wcol_theme = &btheme->tui.wcol_menu_back;
+ }
+ break;
+
+ case UI_BTYPE_TAB:
+ wt = widget_type(UI_WTYPE_TAB);
+ break;
+
+ case UI_BTYPE_BUT_TOGGLE:
+ case UI_BTYPE_TOGGLE:
+ case UI_BTYPE_TOGGLE_N:
+ wt = widget_type(UI_WTYPE_TOGGLE);
+ break;
+
+ case UI_BTYPE_CHECKBOX:
+ case UI_BTYPE_CHECKBOX_N:
+ if (!(but->flag & UI_HAS_ICON)) {
+ wt = widget_type(UI_WTYPE_CHECKBOX);
+ if ((but->drawflag & (UI_BUT_TEXT_LEFT | UI_BUT_TEXT_RIGHT)) == 0) {
+ but->drawflag |= UI_BUT_TEXT_LEFT;
+ }
+ }
+ else {
+ wt = widget_type(UI_WTYPE_TOGGLE);
+ }
+
+ /* option buttons have strings outside, on menus use different colors */
+ if (but->block->theme_style == UI_BLOCK_THEME_STYLE_POPUP) {
+ wt->state = widget_state_option_menu;
+ }
+ break;
+
+ case UI_BTYPE_MENU:
+ case UI_BTYPE_BLOCK:
+ case UI_BTYPE_POPOVER:
+ if (but->flag & UI_BUT_NODE_LINK) {
+ /* new node-link button, not active yet XXX */
+ wt = widget_type(UI_WTYPE_MENU_NODE_LINK);
+ }
+ else {
+ /* with menu arrows */
+
+ /* we could use a flag for this, but for now just check size,
+ * add updown arrows if there is room. */
+ if ((!but->str[0] && but->icon && (BLI_rcti_size_x(rect) < BLI_rcti_size_y(rect) + 2)) ||
+ /* disable for brushes also */
+ (but->flag & UI_BUT_ICON_PREVIEW)) {
+ /* no arrows */
+ wt = widget_type(UI_WTYPE_MENU_ICON_RADIO);
+ }
+ else {
+ wt = widget_type(UI_WTYPE_MENU_RADIO);
+ }
+ }
+ break;
+
+ case UI_BTYPE_PULLDOWN:
+ wt = widget_type(UI_WTYPE_PULLDOWN);
+ break;
+
+ case UI_BTYPE_BUT_MENU:
+ wt = widget_type(UI_WTYPE_MENU_ITEM);
+ break;
+
+ case UI_BTYPE_COLOR:
+ wt = widget_type(UI_WTYPE_SWATCH);
+ break;
+
+ case UI_BTYPE_ROUNDBOX:
+ case UI_BTYPE_LISTBOX:
+ wt = widget_type(UI_WTYPE_BOX);
+ break;
+
+ case UI_BTYPE_EXTRA:
+ widget_draw_extra_mask(C, but, widget_type(UI_WTYPE_BOX), rect);
+ break;
+
+ case UI_BTYPE_HSVCUBE:
+ if (ELEM(but->a1, UI_GRAD_V_ALT, UI_GRAD_L_ALT)) {
+ /* vertical V slider, uses new widget draw now */
+ ui_draw_but_HSV_v(but, rect);
+ }
+ else { /* other HSV pickers... */
+ ui_draw_but_HSVCUBE(but, rect);
+ }
+ break;
+
+ case UI_BTYPE_HSVCIRCLE:
+ ui_draw_but_HSVCIRCLE(but, &tui->wcol_regular, rect);
+ break;
+
+ case UI_BTYPE_COLORBAND:
+ ui_draw_but_COLORBAND(but, &tui->wcol_regular, rect);
+ break;
+
+ case UI_BTYPE_UNITVEC:
+ wt = widget_type(UI_WTYPE_UNITVEC);
+ break;
+
+ case UI_BTYPE_IMAGE:
+ ui_draw_but_IMAGE(ar, but, &tui->wcol_regular, rect);
+ break;
+
+ case UI_BTYPE_HISTOGRAM:
+ ui_draw_but_HISTOGRAM(ar, but, &tui->wcol_regular, rect);
+ break;
+
+ case UI_BTYPE_WAVEFORM:
+ ui_draw_but_WAVEFORM(ar, but, &tui->wcol_regular, rect);
+ break;
+
+ case UI_BTYPE_VECTORSCOPE:
+ ui_draw_but_VECTORSCOPE(ar, but, &tui->wcol_regular, rect);
+ break;
+
+ case UI_BTYPE_CURVE:
+ ui_draw_but_CURVE(ar, but, &tui->wcol_regular, rect);
+ break;
+
+ case UI_BTYPE_PROGRESS_BAR:
+ wt = widget_type(UI_WTYPE_PROGRESSBAR);
+ fstyle = &style->widgetlabel;
+ break;
+
+ case UI_BTYPE_SCROLL:
+ wt = widget_type(UI_WTYPE_SCROLL);
+ break;
+
+ case UI_BTYPE_GRIP:
+ wt = widget_type(UI_WTYPE_ICON);
+ break;
+
+ case UI_BTYPE_TRACK_PREVIEW:
+ ui_draw_but_TRACKPREVIEW(ar, but, &tui->wcol_regular, rect);
+ break;
+
+ case UI_BTYPE_NODE_SOCKET:
+ ui_draw_but_NODESOCKET(ar, but, &tui->wcol_regular, rect);
+ break;
+
+ default:
+ wt = widget_type(UI_WTYPE_REGULAR);
+ break;
+ }
+ }
+
+ if (wt) {
+ //rcti disablerect = *rect; /* rect gets clipped smaller for text */
+ int roundboxalign, state, drawflag;
+ bool disabled = false;
+
+ roundboxalign = widget_roundbox_set(but, rect);
+
+ /* Mask out flags re-used for local state. */
+ state = but->flag & ~UI_STATE_FLAGS_ALL;
+ drawflag = but->drawflag;
+
+ if (state & UI_SELECT_DRAW) {
+ state |= UI_SELECT;
+ }
+
+ if ((but->editstr) ||
+ (UNLIKELY(but->flag & UI_BUT_DRAG_MULTI) && ui_but_drag_multi_edit_get(but))) {
+ state |= UI_STATE_TEXT_INPUT;
+ }
+
+ if (but->hold_func) {
+ state |= UI_STATE_HOLD_ACTION;
+ }
+
+ if (state & UI_ACTIVE) {
+ if (but->drawflag & UI_BUT_ACTIVE_LEFT) {
+ state |= UI_STATE_ACTIVE_LEFT;
+ }
+ else if (but->drawflag & UI_BUT_ACTIVE_RIGHT) {
+ state |= UI_STATE_ACTIVE_RIGHT;
+ }
+ }
+
+ if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE)) {
+ if (but->dt != UI_EMBOSS_PULLDOWN) {
+ disabled = true;
+ }
+ }
+
+ if (drawflag & UI_BUT_TEXT_RIGHT) {
+ state |= UI_STATE_TEXT_BEFORE_WIDGET;
+ }
+
+ if (disabled) {
+ ui_widget_color_disabled(wt);
+ }
+
+ wt->state(wt, state, drawflag);
+ if (wt->custom) {
+ wt->custom(but, &wt->wcol, rect, state, roundboxalign);
+ }
+ else if (wt->draw) {
+ wt->draw(&wt->wcol, rect, state, roundboxalign);
+ }
+
+ if (disabled) {
+ GPU_blend(true);
+ }
+
+ bool show_semi_highlight = false;
#ifdef USE_UI_POPOVER_ONCE
- if (but->block->flag & UI_BLOCK_POPOVER_ONCE) {
- if ((state & UI_ACTIVE) && ui_but_is_popover_once_compat(but)) {
- show_semi_highlight = true;
- }
- }
+ if (but->block->flag & UI_BLOCK_POPOVER_ONCE) {
+ if ((state & UI_ACTIVE) && ui_but_is_popover_once_compat(but)) {
+ show_semi_highlight = true;
+ }
+ }
#endif
- if (but->flag & UI_BUT_ACTIVE_DEFAULT) {
- show_semi_highlight = true;
- }
-
- if (show_semi_highlight) {
- uiWidgetType wt_back = *wt;
- uiWidgetType *wt_temp = widget_type(UI_WTYPE_MENU_ITEM);
- wt_temp->state(wt_temp, state, drawflag);
- copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
- wt->wcol.inner[3] = 128;
- wt->wcol.roundness = 0.5f;
- ui_draw_roundbox(
- &rect_orig,
- 0.25f * min_ff(BLI_rcti_size_x(&rect_orig), BLI_rcti_size_y(&rect_orig)),
- &wt_temp->wcol);
- *wt = wt_back;
- }
-
- wt->text(fstyle, &wt->wcol, but, rect);
- if (disabled) {
- GPU_blend(false);
- }
-
-// if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE)) {
-// if (but->dt != UI_EMBOSS_PULLDOWN) {
-// widget_disabled(&disablerect);
-// }
-// }
- }
+ if (but->flag & UI_BUT_ACTIVE_DEFAULT) {
+ show_semi_highlight = true;
+ }
+
+ if (show_semi_highlight) {
+ uiWidgetType wt_back = *wt;
+ uiWidgetType *wt_temp = widget_type(UI_WTYPE_MENU_ITEM);
+ wt_temp->state(wt_temp, state, drawflag);
+ copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
+ wt->wcol.inner[3] = 128;
+ wt->wcol.roundness = 0.5f;
+ ui_draw_roundbox(&rect_orig,
+ 0.25f * min_ff(BLI_rcti_size_x(&rect_orig), BLI_rcti_size_y(&rect_orig)),
+ &wt_temp->wcol);
+ *wt = wt_back;
+ }
+
+ wt->text(fstyle, &wt->wcol, but, rect);
+ if (disabled) {
+ GPU_blend(false);
+ }
+
+ // if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE)) {
+ // if (but->dt != UI_EMBOSS_PULLDOWN) {
+ // widget_disabled(&disablerect);
+ // }
+ // }
+ }
}
static void ui_draw_clip_tri(uiBlock *block, rcti *rect, uiWidgetType *wt)
{
- if (block) {
- float draw_color[4];
- uchar *color = (uchar *)wt->wcol.text;
-
- draw_color[0] = ((float)color[0]) / 255.0f;
- draw_color[1] = ((float)color[1]) / 255.0f;
- draw_color[2] = ((float)color[2]) / 255.0f;
- draw_color[3] = 1.0f;
-
- if (block->flag & UI_BLOCK_CLIPTOP) {
- /* XXX no scaling for UI here yet */
- UI_draw_icon_tri(BLI_rcti_cent_x(rect), rect->ymax - 8, 't', draw_color);
- }
- if (block->flag & UI_BLOCK_CLIPBOTTOM) {
- /* XXX no scaling for UI here yet */
- UI_draw_icon_tri(BLI_rcti_cent_x(rect), rect->ymin + 10, 'v', draw_color);
- }
- }
+ if (block) {
+ float draw_color[4];
+ uchar *color = (uchar *)wt->wcol.text;
+
+ draw_color[0] = ((float)color[0]) / 255.0f;
+ draw_color[1] = ((float)color[1]) / 255.0f;
+ draw_color[2] = ((float)color[2]) / 255.0f;
+ draw_color[3] = 1.0f;
+
+ if (block->flag & UI_BLOCK_CLIPTOP) {
+ /* XXX no scaling for UI here yet */
+ UI_draw_icon_tri(BLI_rcti_cent_x(rect), rect->ymax - 8, 't', draw_color);
+ }
+ if (block->flag & UI_BLOCK_CLIPBOTTOM) {
+ /* XXX no scaling for UI here yet */
+ UI_draw_icon_tri(BLI_rcti_cent_x(rect), rect->ymin + 10, 'v', draw_color);
+ }
+ }
}
void ui_draw_menu_back(uiStyle *UNUSED(style), uiBlock *block, rcti *rect)
{
- uiWidgetType *wt = widget_type(UI_WTYPE_MENU_BACK);
+ uiWidgetType *wt = widget_type(UI_WTYPE_MENU_BACK);
- wt->state(wt, 0, 0);
- if (block) {
- wt->draw(&wt->wcol, rect, block->flag, block->direction);
- }
- else {
- wt->draw(&wt->wcol, rect, 0, 0);
- }
+ wt->state(wt, 0, 0);
+ if (block) {
+ wt->draw(&wt->wcol, rect, block->flag, block->direction);
+ }
+ else {
+ wt->draw(&wt->wcol, rect, 0, 0);
+ }
- ui_draw_clip_tri(block, rect, wt);
+ ui_draw_clip_tri(block, rect, wt);
}
/**
* Similar to 'widget_menu_back', however we can't use the widget preset system
* because we need to pass in the original location so we know where to show the arrow.
*/
-static void ui_draw_popover_back_impl(
- const uiWidgetColors *wcol, rcti *rect, int direction, const float unit_size,
- const float mval_origin[2])
+static void ui_draw_popover_back_impl(const uiWidgetColors *wcol,
+ rcti *rect,
+ int direction,
+ const float unit_size,
+ const float mval_origin[2])
{
- /* tsk, this isn't nice. */
- const float unit_half = unit_size / 2;
- const float cent_x = mval_origin ? mval_origin[0] : BLI_rcti_cent_x(rect);
- rect->ymax -= unit_half;
- rect->ymin += unit_half;
-
- GPU_blend(true);
-
- /* Extracted from 'widget_menu_back', keep separate to avoid menu changes breaking popovers */
- {
- uiWidgetBase wtb;
- widget_init(&wtb);
-
- const int roundboxalign = UI_CNR_ALL;
- widget_softshadow(rect, roundboxalign, wcol->roundness * U.widget_unit);
-
- round_box_edges(&wtb, roundboxalign, rect, wcol->roundness * U.widget_unit);
- wtb.draw_emboss = false;
- widgetbase_draw(&wtb, wcol);
- }
-
- /* Draw popover arrow (top/bottom) */
- if (ELEM(direction, UI_DIR_UP, UI_DIR_DOWN)) {
- uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
- immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
- immUniformColor4ubv((uchar *)wcol->inner);
- GPU_blend(true);
- immBegin(GPU_PRIM_TRIS, 3);
- if (direction == UI_DIR_DOWN) {
- const float y = rect->ymax;
- immVertex2f(pos, cent_x - unit_half, y);
- immVertex2f(pos, cent_x + unit_half, y);
- immVertex2f(pos, cent_x, y + unit_half);
- }
- else {
- const float y = rect->ymin;
- immVertex2f(pos, cent_x - unit_half, y);
- immVertex2f(pos, cent_x + unit_half, y);
- immVertex2f(pos, cent_x, y - unit_half);
- }
- immEnd();
- immUnbindProgram();
- }
-
- GPU_blend(false);
+ /* tsk, this isn't nice. */
+ const float unit_half = unit_size / 2;
+ const float cent_x = mval_origin ? mval_origin[0] : BLI_rcti_cent_x(rect);
+ rect->ymax -= unit_half;
+ rect->ymin += unit_half;
+
+ GPU_blend(true);
+
+ /* Extracted from 'widget_menu_back', keep separate to avoid menu changes breaking popovers */
+ {
+ uiWidgetBase wtb;
+ widget_init(&wtb);
+
+ const int roundboxalign = UI_CNR_ALL;
+ widget_softshadow(rect, roundboxalign, wcol->roundness * U.widget_unit);
+
+ round_box_edges(&wtb, roundboxalign, rect, wcol->roundness * U.widget_unit);
+ wtb.draw_emboss = false;
+ widgetbase_draw(&wtb, wcol);
+ }
+
+ /* Draw popover arrow (top/bottom) */
+ if (ELEM(direction, UI_DIR_UP, UI_DIR_DOWN)) {
+ uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+ immUniformColor4ubv((uchar *)wcol->inner);
+ GPU_blend(true);
+ immBegin(GPU_PRIM_TRIS, 3);
+ if (direction == UI_DIR_DOWN) {
+ const float y = rect->ymax;
+ immVertex2f(pos, cent_x - unit_half, y);
+ immVertex2f(pos, cent_x + unit_half, y);
+ immVertex2f(pos, cent_x, y + unit_half);
+ }
+ else {
+ const float y = rect->ymin;
+ immVertex2f(pos, cent_x - unit_half, y);
+ immVertex2f(pos, cent_x + unit_half, y);
+ immVertex2f(pos, cent_x, y - unit_half);
+ }
+ immEnd();
+ immUnbindProgram();
+ }
+
+ GPU_blend(false);
}
void ui_draw_popover_back(ARegion *ar, uiStyle *UNUSED(style), uiBlock *block, rcti *rect)
{
- uiWidgetType *wt = widget_type(UI_WTYPE_MENU_BACK);
-
- if (block) {
- float mval_origin[2] = {UNPACK2(block->bounds_offset)};
- ui_window_to_block_fl(ar, block, &mval_origin[0], &mval_origin[1]);
- ui_draw_popover_back_impl(wt->wcol_theme, rect, block->direction, U.widget_unit / block->aspect, mval_origin);
- }
- else {
- wt->state(wt, 0, 0);
- wt->draw(&wt->wcol, rect, 0, 0);
- }
-
- ui_draw_clip_tri(block, rect, wt);
+ uiWidgetType *wt = widget_type(UI_WTYPE_MENU_BACK);
+
+ if (block) {
+ float mval_origin[2] = {UNPACK2(block->bounds_offset)};
+ ui_window_to_block_fl(ar, block, &mval_origin[0], &mval_origin[1]);
+ ui_draw_popover_back_impl(
+ wt->wcol_theme, rect, block->direction, U.widget_unit / block->aspect, mval_origin);
+ }
+ else {
+ wt->state(wt, 0, 0);
+ wt->draw(&wt->wcol, rect, 0, 0);
+ }
+
+ ui_draw_clip_tri(block, rect, wt);
}
-static void draw_disk_shaded(
- float start, float angle,
- float radius_int, float radius_ext, int subd,
- const char col1[4], const char col2[4],
- bool shaded)
+static void draw_disk_shaded(float start,
+ float angle,
+ float radius_int,
+ float radius_ext,
+ int subd,
+ const char col1[4],
+ const char col2[4],
+ bool shaded)
{
- const float radius_ext_scale = (0.5f / radius_ext); /* 1 / (2 * radius_ext) */
- int i;
-
- float s, c;
- float y1, y2;
- float fac;
- uchar r_col[4];
- uint pos, col;
-
- GPUVertFormat *format = immVertexFormat();
- pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
- if (shaded) {
- col = GPU_vertformat_attr_add(format, "color", GPU_COMP_U8, 4, GPU_FETCH_INT_TO_FLOAT_UNIT);
- immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
- }
- else {
- immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
- immUniformColor4ubv((uchar *)col1);
- }
-
- immBegin(GPU_PRIM_TRI_STRIP, subd * 2);
- for (i = 0; i < subd; i++) {
- float a;
-
- a = start + ((i) / (float)(subd - 1)) * angle;
- s = sinf(a);
- c = cosf(a);
- y1 = s * radius_int;
- y2 = s * radius_ext;
-
- if (shaded) {
- fac = (y1 + radius_ext) * radius_ext_scale;
- round_box_shade_col4_r(r_col, col1, col2, fac);
- immAttr4ubv(col, r_col);
- }
- immVertex2f(pos, c * radius_int, s * radius_int);
-
- if (shaded) {
- fac = (y2 + radius_ext) * radius_ext_scale;
- round_box_shade_col4_r(r_col, col1, col2, fac);
- immAttr4ubv(col, r_col);
- }
- immVertex2f(pos, c * radius_ext, s * radius_ext);
- }
- immEnd();
-
- immUnbindProgram();
+ const float radius_ext_scale = (0.5f / radius_ext); /* 1 / (2 * radius_ext) */
+ int i;
+
+ float s, c;
+ float y1, y2;
+ float fac;
+ uchar r_col[4];
+ uint pos, col;
+
+ GPUVertFormat *format = immVertexFormat();
+ pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+ if (shaded) {
+ col = GPU_vertformat_attr_add(format, "color", GPU_COMP_U8, 4, GPU_FETCH_INT_TO_FLOAT_UNIT);
+ immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
+ }
+ else {
+ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+ immUniformColor4ubv((uchar *)col1);
+ }
+
+ immBegin(GPU_PRIM_TRI_STRIP, subd * 2);
+ for (i = 0; i < subd; i++) {
+ float a;
+
+ a = start + ((i) / (float)(subd - 1)) * angle;
+ s = sinf(a);
+ c = cosf(a);
+ y1 = s * radius_int;
+ y2 = s * radius_ext;
+
+ if (shaded) {
+ fac = (y1 + radius_ext) * radius_ext_scale;
+ round_box_shade_col4_r(r_col, col1, col2, fac);
+ immAttr4ubv(col, r_col);
+ }
+ immVertex2f(pos, c * radius_int, s * radius_int);
+
+ if (shaded) {
+ fac = (y2 + radius_ext) * radius_ext_scale;
+ round_box_shade_col4_r(r_col, col1, col2, fac);
+ immAttr4ubv(col, r_col);
+ }
+ immVertex2f(pos, c * radius_ext, s * radius_ext);
+ }
+ immEnd();
+
+ immUnbindProgram();
}
void ui_draw_pie_center(uiBlock *block)
{
- bTheme *btheme = UI_GetTheme();
- float cx = block->pie_data.pie_center_spawned[0];
- float cy = block->pie_data.pie_center_spawned[1];
-
- float *pie_dir = block->pie_data.pie_dir;
-
- float pie_radius_internal = U.dpi_fac * U.pie_menu_threshold;
- float pie_radius_external = U.dpi_fac * (U.pie_menu_threshold + 7.0f);
-
- int subd = 40;
-
- float angle = atan2f(pie_dir[1], pie_dir[0]);
- float range = (block->pie_data.flags & UI_PIE_DEGREES_RANGE_LARGE) ? M_PI_2 : M_PI_4;
-
- GPU_matrix_push();
- GPU_matrix_translate_2f(cx, cy);
-
- GPU_blend(true);
- if (btheme->tui.wcol_pie_menu.shaded) {
- char col1[4], col2[4];
- shadecolors4(col1, col2, btheme->tui.wcol_pie_menu.inner, btheme->tui.wcol_pie_menu.shadetop, btheme->tui.wcol_pie_menu.shadedown);
- draw_disk_shaded(0.0f, (float)(M_PI * 2.0), pie_radius_internal, pie_radius_external, subd, col1, col2, true);
- }
- else {
- draw_disk_shaded(0.0f, (float)(M_PI * 2.0), pie_radius_internal, pie_radius_external, subd, btheme->tui.wcol_pie_menu.inner, NULL, false);
- }
-
- if (!(block->pie_data.flags & UI_PIE_INVALID_DIR)) {
- if (btheme->tui.wcol_pie_menu.shaded) {
- char col1[4], col2[4];
- shadecolors4(col1, col2, btheme->tui.wcol_pie_menu.inner_sel, btheme->tui.wcol_pie_menu.shadetop, btheme->tui.wcol_pie_menu.shadedown);
- draw_disk_shaded(angle - range / 2.0f, range, pie_radius_internal, pie_radius_external, subd, col1, col2, true);
- }
- else {
- draw_disk_shaded(angle - range / 2.0f, range, pie_radius_internal, pie_radius_external, subd, btheme->tui.wcol_pie_menu.inner_sel, NULL, false);
- }
- }
-
- GPUVertFormat *format = immVertexFormat();
- uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
- immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
- immUniformColor4ubv((uchar *)btheme->tui.wcol_pie_menu.outline);
-
- imm_draw_circle_wire_2d(pos, 0.0f, 0.0f, pie_radius_internal, subd);
- imm_draw_circle_wire_2d(pos, 0.0f, 0.0f, pie_radius_external, subd);
-
- immUnbindProgram();
-
- if (U.pie_menu_confirm > 0 && !(block->pie_data.flags & (UI_PIE_INVALID_DIR | UI_PIE_CLICK_STYLE))) {
- float pie_confirm_radius = U.dpi_fac * (pie_radius_internal + U.pie_menu_confirm);
- float pie_confirm_external = U.dpi_fac * (pie_radius_internal + U.pie_menu_confirm + 7.0f);
-
- const char col[4] = {UNPACK3(btheme->tui.wcol_pie_menu.text_sel), 64};
- draw_disk_shaded(angle - range / 2.0f, range, pie_confirm_radius, pie_confirm_external, subd, col, NULL, false);
- }
-
- GPU_blend(false);
- GPU_matrix_pop();
+ bTheme *btheme = UI_GetTheme();
+ float cx = block->pie_data.pie_center_spawned[0];
+ float cy = block->pie_data.pie_center_spawned[1];
+
+ float *pie_dir = block->pie_data.pie_dir;
+
+ float pie_radius_internal = U.dpi_fac * U.pie_menu_threshold;
+ float pie_radius_external = U.dpi_fac * (U.pie_menu_threshold + 7.0f);
+
+ int subd = 40;
+
+ float angle = atan2f(pie_dir[1], pie_dir[0]);
+ float range = (block->pie_data.flags & UI_PIE_DEGREES_RANGE_LARGE) ? M_PI_2 : M_PI_4;
+
+ GPU_matrix_push();
+ GPU_matrix_translate_2f(cx, cy);
+
+ GPU_blend(true);
+ if (btheme->tui.wcol_pie_menu.shaded) {
+ char col1[4], col2[4];
+ shadecolors4(col1,
+ col2,
+ btheme->tui.wcol_pie_menu.inner,
+ btheme->tui.wcol_pie_menu.shadetop,
+ btheme->tui.wcol_pie_menu.shadedown);
+ draw_disk_shaded(0.0f,
+ (float)(M_PI * 2.0),
+ pie_radius_internal,
+ pie_radius_external,
+ subd,
+ col1,
+ col2,
+ true);
+ }
+ else {
+ draw_disk_shaded(0.0f,
+ (float)(M_PI * 2.0),
+ pie_radius_internal,
+ pie_radius_external,
+ subd,
+ btheme->tui.wcol_pie_menu.inner,
+ NULL,
+ false);
+ }
+
+ if (!(block->pie_data.flags & UI_PIE_INVALID_DIR)) {
+ if (btheme->tui.wcol_pie_menu.shaded) {
+ char col1[4], col2[4];
+ shadecolors4(col1,
+ col2,
+ btheme->tui.wcol_pie_menu.inner_sel,
+ btheme->tui.wcol_pie_menu.shadetop,
+ btheme->tui.wcol_pie_menu.shadedown);
+ draw_disk_shaded(angle - range / 2.0f,
+ range,
+ pie_radius_internal,
+ pie_radius_external,
+ subd,
+ col1,
+ col2,
+ true);
+ }
+ else {
+ draw_disk_shaded(angle - range / 2.0f,
+ range,
+ pie_radius_internal,
+ pie_radius_external,
+ subd,
+ btheme->tui.wcol_pie_menu.inner_sel,
+ NULL,
+ false);
+ }
+ }
+
+ GPUVertFormat *format = immVertexFormat();
+ uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+ immUniformColor4ubv((uchar *)btheme->tui.wcol_pie_menu.outline);
+
+ imm_draw_circle_wire_2d(pos, 0.0f, 0.0f, pie_radius_internal, subd);
+ imm_draw_circle_wire_2d(pos, 0.0f, 0.0f, pie_radius_external, subd);
+
+ immUnbindProgram();
+
+ if (U.pie_menu_confirm > 0 &&
+ !(block->pie_data.flags & (UI_PIE_INVALID_DIR | UI_PIE_CLICK_STYLE))) {
+ float pie_confirm_radius = U.dpi_fac * (pie_radius_internal + U.pie_menu_confirm);
+ float pie_confirm_external = U.dpi_fac * (pie_radius_internal + U.pie_menu_confirm + 7.0f);
+
+ const char col[4] = {UNPACK3(btheme->tui.wcol_pie_menu.text_sel), 64};
+ draw_disk_shaded(angle - range / 2.0f,
+ range,
+ pie_confirm_radius,
+ pie_confirm_external,
+ subd,
+ col,
+ NULL,
+ false);
+ }
+
+ GPU_blend(false);
+ GPU_matrix_pop();
}
-
const uiWidgetColors *ui_tooltip_get_theme(void)
{
- uiWidgetType *wt = widget_type(UI_WTYPE_TOOLTIP);
- return wt->wcol_theme;
+ uiWidgetType *wt = widget_type(UI_WTYPE_TOOLTIP);
+ return wt->wcol_theme;
}
/**
* Generic drawing for background.
*/
-static void ui_draw_widget_back_color(
- uiWidgetTypeEnum type, bool use_shadow, const rcti *rect,
- const float color[4])
+static void ui_draw_widget_back_color(uiWidgetTypeEnum type,
+ bool use_shadow,
+ const rcti *rect,
+ const float color[4])
{
- uiWidgetType *wt = widget_type(type);
-
- if (use_shadow) {
- GPU_blend(true);
- GPU_blend_set_func_separate(GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
- widget_softshadow(rect, UI_CNR_ALL, 0.25f * U.widget_unit);
- GPU_blend(false);
- }
-
- rcti rect_copy = *rect;
- wt->state(wt, 0, 0);
- if (color) {
- rgba_float_to_uchar((uchar *)wt->wcol.inner, color);
- }
- wt->draw(&wt->wcol, &rect_copy, 0, UI_CNR_ALL);
+ uiWidgetType *wt = widget_type(type);
+
+ if (use_shadow) {
+ GPU_blend(true);
+ GPU_blend_set_func_separate(
+ GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
+ widget_softshadow(rect, UI_CNR_ALL, 0.25f * U.widget_unit);
+ GPU_blend(false);
+ }
+
+ rcti rect_copy = *rect;
+ wt->state(wt, 0, 0);
+ if (color) {
+ rgba_float_to_uchar((uchar *)wt->wcol.inner, color);
+ }
+ wt->draw(&wt->wcol, &rect_copy, 0, UI_CNR_ALL);
}
void ui_draw_widget_menu_back_color(const rcti *rect, bool use_shadow, const float color[4])
{
- ui_draw_widget_back_color(UI_WTYPE_MENU_BACK, use_shadow, rect, color);
+ ui_draw_widget_back_color(UI_WTYPE_MENU_BACK, use_shadow, rect, color);
}
void ui_draw_widget_menu_back(const rcti *rect, bool use_shadow)
{
- ui_draw_widget_back_color(UI_WTYPE_MENU_BACK, use_shadow, rect, NULL);
+ ui_draw_widget_back_color(UI_WTYPE_MENU_BACK, use_shadow, rect, NULL);
}
void ui_draw_tooltip_background(uiStyle *UNUSED(style), uiBlock *UNUSED(block), rcti *rect)
{
- uiWidgetType *wt = widget_type(UI_WTYPE_TOOLTIP);
- wt->state(wt, 0, 0);
- /* wt->draw ends up using same function to draw the tooltip as menu_back */
- wt->draw(&wt->wcol, rect, 0, 0);
+ uiWidgetType *wt = widget_type(UI_WTYPE_TOOLTIP);
+ wt->state(wt, 0, 0);
+ /* wt->draw ends up using same function to draw the tooltip as menu_back */
+ wt->draw(&wt->wcol, rect, 0, 0);
}
/* helper call to draw a menu item without button */
/* state: UI_ACTIVE or 0 */
-void ui_draw_menu_item(const uiFontStyle *fstyle, rcti *rect, const char *name, int iconid, int state, bool use_sep)
+void ui_draw_menu_item(
+ const uiFontStyle *fstyle, rcti *rect, const char *name, int iconid, int state, bool use_sep)
{
- uiWidgetType *wt = widget_type(UI_WTYPE_MENU_ITEM);
- rcti _rect = *rect;
- char *cpoin = NULL;
-
- wt->state(wt, state, 0);
- wt->draw(&wt->wcol, rect, 0, 0);
-
- UI_fontstyle_set(fstyle);
-
- /* text location offset */
- rect->xmin += 0.25f * UI_UNIT_X;
- if (iconid) {
- rect->xmin += UI_DPI_ICON_SIZE;
- }
-
- /* cut string in 2 parts? */
- if (use_sep) {
- cpoin = strchr(name, UI_SEP_CHAR);
- if (cpoin) {
- *cpoin = 0;
-
- /* need to set this first */
- UI_fontstyle_set(fstyle);
-
- if (fstyle->kerning == 1) {
- /* for BLF_width */
- BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
- }
-
- rect->xmax -= BLF_width(fstyle->uifont_id, cpoin + 1, INT_MAX) + UI_DPI_ICON_SIZE;
-
- if (fstyle->kerning == 1) {
- BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
- }
- }
- }
-
- {
- char drawstr[UI_MAX_DRAW_STR];
- const float okwidth = (float)BLI_rcti_size_x(rect);
- const size_t max_len = sizeof(drawstr);
- const float minwidth = (float)(UI_DPI_ICON_SIZE);
-
- BLI_strncpy(drawstr, name, sizeof(drawstr));
- if (drawstr[0]) {
- UI_text_clip_middle_ex(fstyle, drawstr, okwidth, minwidth, max_len, '\0');
- }
-
- UI_fontstyle_draw(
- fstyle, rect, drawstr, (uchar *)wt->wcol.text,
- &(struct uiFontStyleDraw_Params) { .align = UI_STYLE_TEXT_LEFT, });
- }
-
- /* part text right aligned */
- if (use_sep) {
- if (cpoin) {
- rect->xmax = _rect.xmax - 5;
- UI_fontstyle_draw(
- fstyle, rect, cpoin + 1, (uchar *)wt->wcol.text,
- &(struct uiFontStyleDraw_Params) { .align = UI_STYLE_TEXT_RIGHT, });
- *cpoin = UI_SEP_CHAR;
- }
- }
-
- /* restore rect, was messed with */
- *rect = _rect;
-
- if (iconid) {
- float height, aspect;
- int xs = rect->xmin + 0.2f * UI_UNIT_X;
- int ys = rect->ymin + 0.1f * BLI_rcti_size_y(rect);
-
- height = ICON_SIZE_FROM_BUTRECT(rect);
- aspect = ICON_DEFAULT_HEIGHT / height;
-
- GPU_blend(true);
- /* XXX scale weak get from fstyle? */
- UI_icon_draw_aspect(xs, ys, iconid, aspect, 1.0f, wt->wcol.text);
- GPU_blend(false);
- }
+ uiWidgetType *wt = widget_type(UI_WTYPE_MENU_ITEM);
+ rcti _rect = *rect;
+ char *cpoin = NULL;
+
+ wt->state(wt, state, 0);
+ wt->draw(&wt->wcol, rect, 0, 0);
+
+ UI_fontstyle_set(fstyle);
+
+ /* text location offset */
+ rect->xmin += 0.25f * UI_UNIT_X;
+ if (iconid) {
+ rect->xmin += UI_DPI_ICON_SIZE;
+ }
+
+ /* cut string in 2 parts? */
+ if (use_sep) {
+ cpoin = strchr(name, UI_SEP_CHAR);
+ if (cpoin) {
+ *cpoin = 0;
+
+ /* need to set this first */
+ UI_fontstyle_set(fstyle);
+
+ if (fstyle->kerning == 1) {
+ /* for BLF_width */
+ BLF_enable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
+ }
+
+ rect->xmax -= BLF_width(fstyle->uifont_id, cpoin + 1, INT_MAX) + UI_DPI_ICON_SIZE;
+
+ if (fstyle->kerning == 1) {
+ BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
+ }
+ }
+ }
+
+ {
+ char drawstr[UI_MAX_DRAW_STR];
+ const float okwidth = (float)BLI_rcti_size_x(rect);
+ const size_t max_len = sizeof(drawstr);
+ const float minwidth = (float)(UI_DPI_ICON_SIZE);
+
+ BLI_strncpy(drawstr, name, sizeof(drawstr));
+ if (drawstr[0]) {
+ UI_text_clip_middle_ex(fstyle, drawstr, okwidth, minwidth, max_len, '\0');
+ }
+
+ UI_fontstyle_draw(fstyle,
+ rect,
+ drawstr,
+ (uchar *)wt->wcol.text,
+ &(struct uiFontStyleDraw_Params){
+ .align = UI_STYLE_TEXT_LEFT,
+ });
+ }
+
+ /* part text right aligned */
+ if (use_sep) {
+ if (cpoin) {
+ rect->xmax = _rect.xmax - 5;
+ UI_fontstyle_draw(fstyle,
+ rect,
+ cpoin + 1,
+ (uchar *)wt->wcol.text,
+ &(struct uiFontStyleDraw_Params){
+ .align = UI_STYLE_TEXT_RIGHT,
+ });
+ *cpoin = UI_SEP_CHAR;
+ }
+ }
+
+ /* restore rect, was messed with */
+ *rect = _rect;
+
+ if (iconid) {
+ float height, aspect;
+ int xs = rect->xmin + 0.2f * UI_UNIT_X;
+ int ys = rect->ymin + 0.1f * BLI_rcti_size_y(rect);
+
+ height = ICON_SIZE_FROM_BUTRECT(rect);
+ aspect = ICON_DEFAULT_HEIGHT / height;
+
+ GPU_blend(true);
+ /* XXX scale weak get from fstyle? */
+ UI_icon_draw_aspect(xs, ys, iconid, aspect, 1.0f, wt->wcol.text);
+ GPU_blend(false);
+ }
}
-void ui_draw_preview_item(const uiFontStyle *fstyle, rcti *rect, const char *name, int iconid, int state)
+void ui_draw_preview_item(
+ const uiFontStyle *fstyle, rcti *rect, const char *name, int iconid, int state)
{
- rcti trect = *rect;
- const float text_size = UI_UNIT_Y;
- float font_dims[2] = {0.0f, 0.0f};
- uiWidgetType *wt = widget_type(UI_WTYPE_MENU_ITEM);
-
- /* drawing button background */
- wt->state(wt, state, 0);
- wt->draw(&wt->wcol, rect, 0, 0);
-
- /* draw icon in rect above the space reserved for the label */
- rect->ymin += text_size;
- GPU_blend(true);
- widget_draw_preview(iconid, 1.0f, rect);
- GPU_blend(false);
-
- BLF_width_and_height(fstyle->uifont_id, name, BLF_DRAW_STR_DUMMY_MAX, &font_dims[0], &font_dims[1]);
-
- /* text rect */
- trect.xmin += 0;
- trect.xmax = trect.xmin + font_dims[0] + U.widget_unit / 2;
- trect.ymin += U.widget_unit / 2;
- trect.ymax = trect.ymin + font_dims[1];
- if (trect.xmax > rect->xmax - PREVIEW_PAD) {
- trect.xmax = rect->xmax - PREVIEW_PAD;
- }
-
- {
- char drawstr[UI_MAX_DRAW_STR];
- const float okwidth = (float)BLI_rcti_size_x(&trect);
- const size_t max_len = sizeof(drawstr);
- const float minwidth = (float)(UI_DPI_ICON_SIZE);
-
- BLI_strncpy(drawstr, name, sizeof(drawstr));
- UI_text_clip_middle_ex(fstyle, drawstr, okwidth, minwidth, max_len, '\0');
-
- UI_fontstyle_draw(
- fstyle, &trect, drawstr, (uchar *)wt->wcol.text,
- &(struct uiFontStyleDraw_Params) { .align = UI_STYLE_TEXT_CENTER, });
- }
+ rcti trect = *rect;
+ const float text_size = UI_UNIT_Y;
+ float font_dims[2] = {0.0f, 0.0f};
+ uiWidgetType *wt = widget_type(UI_WTYPE_MENU_ITEM);
+
+ /* drawing button background */
+ wt->state(wt, state, 0);
+ wt->draw(&wt->wcol, rect, 0, 0);
+
+ /* draw icon in rect above the space reserved for the label */
+ rect->ymin += text_size;
+ GPU_blend(true);
+ widget_draw_preview(iconid, 1.0f, rect);
+ GPU_blend(false);
+
+ BLF_width_and_height(
+ fstyle->uifont_id, name, BLF_DRAW_STR_DUMMY_MAX, &font_dims[0], &font_dims[1]);
+
+ /* text rect */
+ trect.xmin += 0;
+ trect.xmax = trect.xmin + font_dims[0] + U.widget_unit / 2;
+ trect.ymin += U.widget_unit / 2;
+ trect.ymax = trect.ymin + font_dims[1];
+ if (trect.xmax > rect->xmax - PREVIEW_PAD) {
+ trect.xmax = rect->xmax - PREVIEW_PAD;
+ }
+
+ {
+ char drawstr[UI_MAX_DRAW_STR];
+ const float okwidth = (float)BLI_rcti_size_x(&trect);
+ const size_t max_len = sizeof(drawstr);
+ const float minwidth = (float)(UI_DPI_ICON_SIZE);
+
+ BLI_strncpy(drawstr, name, sizeof(drawstr));
+ UI_text_clip_middle_ex(fstyle, drawstr, okwidth, minwidth, max_len, '\0');
+
+ UI_fontstyle_draw(fstyle,
+ &trect,
+ drawstr,
+ (uchar *)wt->wcol.text,
+ &(struct uiFontStyleDraw_Params){
+ .align = UI_STYLE_TEXT_CENTER,
+ });
+ }
}
/** \} */