Commit: 26c5a1c301d3d554c4b1244b219f9883249f382d
Author: Campbell Barton
Date: Sun Jul 1 19:57:31 2018 +0200
Branches: master
https://developer.blender.org/rB26c5a1c301d3d554c4b1244b219f9883249f382d
Cleanup: right shift in interface code
===================================================================
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_draw.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/interface/interface_ops.c
M source/blender/editors/interface/interface_panel.c
M source/blender/editors/interface/interface_query.c
M source/blender/editors/interface/interface_region_search.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/interface/interface_utils.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/interface/view2d.c
M source/blender/editors/interface/view2d_ops.c
===================================================================
diff --git a/source/blender/editors/interface/interface.c
b/source/blender/editors/interface/interface.c
index 645f776db17..e5c3ebf2695 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -961,10 +961,11 @@ void ui_but_add_shortcut(uiBut *but, const char
*shortcut_str, const bool do_str
else {
butstr_orig = BLI_strdup(but->str);
}
- BLI_snprintf(but->strdata,
- sizeof(but->strdata),
- "%s" UI_SEP_CHAR_S "%s",
- butstr_orig, shortcut_str);
+ BLI_snprintf(
+ but->strdata,
+ sizeof(but->strdata),
+ "%s" UI_SEP_CHAR_S "%s",
+ butstr_orig, shortcut_str);
MEM_freeN(butstr_orig);
but->str = but->strdata;
but->flag |= UI_BUT_HAS_SEP_CHAR;
@@ -2119,8 +2120,9 @@ static void ui_get_but_string_unit(uiBut *but, char *str,
int len_max, double va
precision = float_precision;
}
- bUnit_AsString(str, len_max, ui_get_but_scale_unit(but, value),
precision,
- unit->system, RNA_SUBTYPE_UNIT_VALUE(unit_type),
do_split, pad);
+ bUnit_AsString(
+ str, len_max, ui_get_but_scale_unit(but, value), precision,
+ unit->system, RNA_SUBTYPE_UNIT_VALUE(unit_type), do_split, pad);
}
static float ui_get_but_step_unit(uiBut *but, float step_default)
@@ -2337,8 +2339,9 @@ static bool ui_set_but_string_eval_num_unit(bContext *C,
uiBut *but, const char
/* ugly, use the draw string to get the value,
* this could cause problems if it includes some text which resolves to
a unit */
- bUnit_ReplaceString(str_unit_convert, sizeof(str_unit_convert),
but->drawstr,
- ui_get_but_scale_unit(but, 1.0),
but->block->unit->system, RNA_SUBTYPE_UNIT_VALUE(unit_type));
+ bUnit_ReplaceString(
+ str_unit_convert, sizeof(str_unit_convert), but->drawstr,
+ ui_get_but_scale_unit(but, 1.0), but->block->unit->system,
RNA_SUBTYPE_UNIT_VALUE(unit_type));
return BPY_execute_string_as_number(C, str_unit_convert, true, r_value);
}
@@ -3391,12 +3394,14 @@ static void ui_def_but_rna__menu(bContext *UNUSED(C),
uiLayout *layout, void *bu
}
else {
if (item->icon) {
- uiDefIconTextButI(block, UI_BTYPE_BUT_MENU,
B_NOP, item->icon, item->name, 0, 0,
- UI_UNIT_X * 5, UI_UNIT_Y,
&handle->retvalue, item->value, 0.0, 0, -1, item->description);
+ uiDefIconTextButI(
+ block, UI_BTYPE_BUT_MENU, B_NOP,
item->icon, item->name, 0, 0,
+ UI_UNIT_X * 5, UI_UNIT_Y,
&handle->retvalue, item->value, 0.0, 0, -1, item->description);
}
else {
- uiDefButI(block, UI_BTYPE_BUT_MENU, B_NOP,
item->name, 0, 0,
- UI_UNIT_X * 5, UI_UNIT_X,
&handle->retvalue, item->value, 0.0, 0, -1, item->description);
+ uiDefButI(
+ block, UI_BTYPE_BUT_MENU, B_NOP,
item->name, 0, 0,
+ UI_UNIT_X * 5, UI_UNIT_X,
&handle->retvalue, item->value, 0.0, 0, -1, item->description);
}
}
}
diff --git a/source/blender/editors/interface/interface_draw.c
b/source/blender/editors/interface/interface_draw.c
index 17dc9710756..50cd1c544c4 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -81,8 +81,10 @@ int UI_draw_roundbox_corner_get(void)
void UI_draw_roundbox_gl_mode(int mode, float minx, float miny, float maxx,
float maxy, float rad)
{
- float vec[7][2] = {{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}};
+ float vec[7][2] = {
+ {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},
+ };
int a;
/* mult */
@@ -159,8 +161,9 @@ void UI_draw_roundbox_shade_x(
int mode, float minx, float miny, float maxx, float maxy,
float rad, float shadetop, float shadedown)
{
- float vec[7][2] = {{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}};
+ float vec[7][2] = {
+ {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}};
const float div = maxy - miny;
const float idiv = 1.0f / div;
float coltop[3], coldown[3], color[4];
@@ -267,8 +270,9 @@ void UI_draw_roundbox_shade_y(
int mode, float minx, float miny, float maxx, float maxy,
float rad, float shadeLeft, float shadeRight)
{
- float vec[7][2] = {{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}};
+ float vec[7][2] = {
+ {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}};
const float div = maxx - minx;
const float idiv = 1.0f / div;
float colLeft[3], colRight[3], color[4];
@@ -1526,10 +1530,11 @@ void ui_draw_but_TRACKPREVIEW(ARegion *ar, uiBut *but,
uiWidgetColors *UNUSED(wc
if (scopes->track_preview)
IMB_freeImBuf(scopes->track_preview);
- ImBuf *tmpibuf =
BKE_tracking_sample_pattern(scopes->frame_width, scopes->frame_height,
-
scopes->track_search, scopes->track,
-
&scopes->undist_marker, true, scopes->use_track_mask,
- width, height,
scopes->track_pos);
+ ImBuf *tmpibuf = BKE_tracking_sample_pattern(
+ scopes->frame_width, scopes->frame_height,
+ scopes->track_search, scopes->track,
+ &scopes->undist_marker, true, scopes->use_track_mask,
+ width, height, scopes->track_pos);
if (tmpibuf) {
if (tmpibuf->rect_float)
IMB_rect_from_float(tmpibuf);
@@ -1556,8 +1561,9 @@ void ui_draw_but_TRACKPREVIEW(ARegion *ar, uiBut *but,
uiWidgetColors *UNUSED(wc
UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin
- 1, rect.ymin, rect.xmax + 1, rect.ymax + 1, 3.0f);
}
- glaDrawPixelsSafe(rect.xmin, rect.ymin + 1,
drawibuf->x, drawibuf->y,
- drawibuf->x, GL_RGBA,
GL_UNSIGNED_BYTE, drawibuf->rect);
+ glaDrawPixelsSafe(
+ rect.xmin, rect.ymin + 1, drawibuf->x,
drawibuf->y,
+ drawibuf->x, GL_RGBA, GL_UNSIGNED_BYTE,
drawibuf->rect);
/* draw cross for pixel position */
glTranslatef(rect.xmin + scopes->track_pos[0],
rect.ymin + scopes->track_pos[1], 0.f);
diff --git a/source/blender/editors/interface/interface_handlers.c
b/source/blender/editors/interface/interface_handlers.c
index a529568ccc9..06b6099cec7 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -1314,8 +1314,10 @@ static void ui_drag_toggle_set(bContext *C,
uiDragToggleHandle *drag_info, const
if (but) {
if (but->flag & UI_BUT_DRAG_LOCK) {
- const float but_cent_new[2] =
{BLI_rctf_cent_x(&but->rect),
-
BLI_rctf_cent_y(&but->rect)};
+ const float but_cent_new[2] = {
+ BLI_rctf_cent_x(&but->rect),
+ BLI_rctf_cent_y(&but->rect),
+ };
/* check if this is a different button, chances
are high the button wont move about :) */
if
(len_manhattan_v2v2(drag_info->but_cent_start, but_cent_new) > 1.0f) {
@@ -1387,10 +1389,11 @@ static int ui_handler_region_drag_toggle(bContext *C,
const wmEvent *event, void
ui_apply_but_undo(but);
}
- WM_event_remove_ui_handler(&win->modalhandlers,
- ui_handler_region_drag_toggle,
- ui_handler_region_drag_toggle_remove,
- drag_info, false);
+ WM_event_remove_ui_handler(
+ &win->modalhandlers,
+ ui_handler_region_drag_toggle,
+ ui_handler_region_drag_toggle_remove,
+ drag_info, false);
ui_handler_region_drag_toggle_remove(C, drag_info);
WM_event_add_mousemove(C);
@@ -3364,13 +3367,15 @@ static void ui_do_but_textedit(
}
break;
case RIGHTARROWKEY:
- ui_textedit_move(but, data, STRCUR_DIR_NEXT,
- event->shift != 0, event->ctrl
? STRCUR_JUMP_DELIM : STRCUR_JUMP_NONE);
+ ui_textedit_move(
+ but, data, STRCUR_DIR_NEXT,
+ event->shift != 0, event->ctrl ?
STRCUR_JUMP_DELIM : STRCUR_JUMP_NONE);
retval = WM_UI_HANDLER_BREAK;
break;
case LEFTARROWKEY:
- ui_textedit_move(but, data, STRCUR_DIR_PREV,
- event->shift != 0, event->ctrl
? STRCUR_JUMP_DELIM : STRCUR_JUMP_NONE);
+ ui_textedit_move(
+ but, data, STRCUR_DIR_PREV,
+ event->shift != 0, event->ctrl ?
STRCUR_JUMP_DELIM : STRCUR_JUMP_NONE);
retval = WM_UI_HANDLER_BREAK;
break;
case WHEELDOWNMOUSE:
@@ -3387,8 +3392,9 @@ static void ui_do_but_textedit(
}
ATTR_FALLTHROUGH;
case ENDKEY:
- ui_textedit_move(but, data, STRCUR_DIR_NEXT,
- event->shift != 0,
STRCUR_JUMP_ALL);
+ ui_textedit_move(
+ but, data, STRCUR_DIR_NEXT,
+ event->shift != 0, STRCUR_JUMP_ALL);
retval = WM_UI_HANDLER_BREAK;
break;
case WHEELUPMOUSE:
@@ -3405,8 +3411,9 @@ static void ui_do_but_textedit(
}
ATTR_FALLTHROUGH;
case HOMEKEY:
- ui_textedit_move(but, data, STRCUR_DIR_PREV,
- event->shift != 0,
STRCUR_JUMP_ALL);
+ ui_textedit_move(
+ but, data, STRCUR_DIR_PREV,
+ event->shift != 0, STRCUR_JUMP_ALL);
retval = WM_UI_HANDLER_BREAK;
break;
case PADENTER:
@@ -3415,14 +3422,16 @@ static void ui_do_but_textedit(
retval = WM_UI_HANDLER_BREAK;
break;
case DELKEY:
- changed = ui_textedit_delete(but, data, 1,
- event->ctrl ?
STRCUR_JUMP_DELIM : STRCUR_JUMP_NONE);
+ changed = ui_textedit_delete(
+ but, data, 1,
+ event->ctrl ? STRCUR_JUMP_DELIM :
STRCUR_JUMP_NONE);
retval = WM_UI_HANDLER_BREAK;
break;
case BACKSPACEKEY:
- changed = ui_textedit_delete(but, data, 0,
- event->ctrl ?
STRCUR_JUMP_DELIM : STRCUR_JUMP_NONE);
+ changed = ui_textedit_delete(
+ but, data, 0,
+ event->ctrl ? STRCUR_JUMP_DELIM :
STRCUR_JUMP_NONE);
re
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
