diff options
Diffstat (limited to 'source/blender/editors/interface/interface_panel.cc')
-rw-r--r-- | source/blender/editors/interface/interface_panel.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/editors/interface/interface_panel.cc b/source/blender/editors/interface/interface_panel.cc index 90572c45e8b..d25302616e5 100644 --- a/source/blender/editors/interface/interface_panel.cc +++ b/source/blender/editors/interface/interface_panel.cc @@ -142,7 +142,7 @@ static bool panel_active_animation_changed(ListBase *lb, } /* Detect changes in panel expansions. */ - if ((bool)(panel->runtime_flag & PANEL_WAS_CLOSED) != UI_panel_is_closed(panel)) { + if (bool(panel->runtime_flag & PANEL_WAS_CLOSED) != UI_panel_is_closed(panel)) { *r_panel_animation = panel; return false; } @@ -1232,7 +1232,7 @@ void ui_draw_aligned_panel(const uiStyle *style, rect->xmin, rect->xmax, rect->ymax, - rect->ymax + (int)floor(PNL_HEADER / block->aspect + 0.001f), + rect->ymax + int(floor(PNL_HEADER / block->aspect + 0.001f)), }; if (show_background) { @@ -1368,7 +1368,7 @@ void UI_panel_category_draw_all(ARegion *region, const char *category_id_active) } if (y_ofs > BLI_rcti_size_y(&v2d->mask)) { - scaletabs = (float)BLI_rcti_size_y(&v2d->mask) / (float)y_ofs; + scaletabs = float(BLI_rcti_size_y(&v2d->mask)) / float(y_ofs); LISTBASE_FOREACH (PanelCategoryDyn *, pc_dyn, ®ion->panels_category) { rcti *rct = &pc_dyn->rect; @@ -1705,12 +1705,12 @@ static bool uiAlignPanelStep(ARegion *region, const float factor, const bool dra } if (ps->new_offset_x != ps->panel->ofsx) { - const float x = interpf((float)ps->new_offset_x, (float)ps->panel->ofsx, factor); + const float x = interpf(float(ps->new_offset_x), float(ps->panel->ofsx), factor); ps->panel->ofsx = round_fl_to_int(x); changed = true; } if (ps->new_offset_y != ps->panel->ofsy) { - const float y = interpf((float)ps->new_offset_y, (float)ps->panel->ofsy, factor); + const float y = interpf(float(ps->new_offset_y), float(ps->panel->ofsy), factor); ps->panel->ofsy = round_fl_to_int(y); changed = true; } @@ -1875,13 +1875,13 @@ static void ui_do_drag(const bContext *C, const wmEvent *event, Panel *panel) /* Keep the drag position in the region with a small pad to keep the panel visible. */ const int y = clamp_i(event->xy[1], region->winrct.ymin, region->winrct.ymax + DRAG_REGION_PAD); - float dy = (float)(y - data->starty); + float dy = float(y - data->starty); /* Adjust for region zoom. */ - dy *= BLI_rctf_size_y(®ion->v2d.cur) / (float)BLI_rcti_size_y(®ion->winrct); + dy *= BLI_rctf_size_y(®ion->v2d.cur) / float(BLI_rcti_size_y(®ion->winrct)); /* Add the movement of the view due to edge scrolling while dragging. */ - dy += ((float)region->v2d.cur.ymin - data->start_cur_ymin); + dy += (float(region->v2d.cur.ymin) - data->start_cur_ymin); panel->ofsy = data->startofsy + round_fl_to_int(dy); @@ -1902,16 +1902,16 @@ static uiPanelMouseState ui_panel_mouse_state_get(const uiBlock *block, const int mx, const int my) { - if (!IN_RANGE((float)mx, block->rect.xmin, block->rect.xmax)) { + if (!IN_RANGE(float(mx), block->rect.xmin, block->rect.xmax)) { return PANEL_MOUSE_OUTSIDE; } - if (IN_RANGE((float)my, block->rect.ymax, block->rect.ymax + PNL_HEADER)) { + if (IN_RANGE(float(my), block->rect.ymax, block->rect.ymax + PNL_HEADER)) { return PANEL_MOUSE_INSIDE_HEADER; } if (!UI_panel_is_closed(panel)) { - if (IN_RANGE((float)my, block->rect.ymin, block->rect.ymax + PNL_HEADER)) { + if (IN_RANGE(float(my), block->rect.ymin, block->rect.ymax + PNL_HEADER)) { return PANEL_MOUSE_INSIDE_CONTENT; } } @@ -1937,8 +1937,8 @@ static void ui_panel_drag_collapse(const bContext *C, ARegion *region = CTX_wm_region(C); LISTBASE_FOREACH (uiBlock *, block, ®ion->uiblocks) { - float xy_a_block[2] = {(float)dragcol_data->xy_init[0], (float)dragcol_data->xy_init[1]}; - float xy_b_block[2] = {(float)xy_dst[0], (float)xy_dst[1]}; + float xy_a_block[2] = {float(dragcol_data->xy_init[0]), float(dragcol_data->xy_init[1])}; + float xy_b_block[2] = {float(xy_dst[0]), float(xy_dst[1])}; Panel *panel = block->panel; if (panel == nullptr || (panel->type && (panel->type->flag & PANEL_TYPE_NO_HEADER))) { |