forked from bartvdbraak/blender
Cleanup: sync clang-format with master
Avoid noisy diff's & conflicts.
This commit is contained in:
parent
1cbc3a8f2b
commit
e22ea3dc0e
@ -256,6 +256,7 @@ ForEachMacros:
|
|||||||
- SEQ_BEGIN
|
- SEQ_BEGIN
|
||||||
- SURFACE_QUAD_ITER_BEGIN
|
- SURFACE_QUAD_ITER_BEGIN
|
||||||
- foreach
|
- foreach
|
||||||
|
- ED_screen_areas_iter
|
||||||
|
|
||||||
# Use once we bump the minimum version to version 8.
|
# Use once we bump the minimum version to version 8.
|
||||||
# # Without this string literals that in-line 'STRINGIFY' behave strangely (a bug?).
|
# # Without this string literals that in-line 'STRINGIFY' behave strangely (a bug?).
|
||||||
|
@ -10938,8 +10938,7 @@ void UI_screen_free_active_but(const bContext *C, bScreen *screen)
|
|||||||
{
|
{
|
||||||
wmWindow *win = CTX_wm_window(C);
|
wmWindow *win = CTX_wm_window(C);
|
||||||
|
|
||||||
ED_screen_areas_iter(win, screen, area)
|
ED_screen_areas_iter (win, screen, area) {
|
||||||
{
|
|
||||||
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
|
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
|
||||||
uiBut *but = ui_region_find_active_but(region);
|
uiBut *but = ui_region_find_active_but(region);
|
||||||
if (but) {
|
if (but) {
|
||||||
|
@ -413,8 +413,7 @@ static void region_cursor_set(wmWindow *win, bool swin_changed)
|
|||||||
{
|
{
|
||||||
bScreen *screen = WM_window_get_active_screen(win);
|
bScreen *screen = WM_window_get_active_screen(win);
|
||||||
|
|
||||||
ED_screen_areas_iter(win, screen, area)
|
ED_screen_areas_iter (win, screen, area) {
|
||||||
{
|
|
||||||
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
|
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
|
||||||
if (region == screen->active_region) {
|
if (region == screen->active_region) {
|
||||||
region_cursor_set_ex(win, area, region, swin_changed);
|
region_cursor_set_ex(win, area, region, swin_changed);
|
||||||
@ -467,8 +466,7 @@ void ED_screen_refresh(wmWindowManager *wm, wmWindow *win)
|
|||||||
|
|
||||||
screen_geom_vertices_scale(win, screen);
|
screen_geom_vertices_scale(win, screen);
|
||||||
|
|
||||||
ED_screen_areas_iter(win, screen, area)
|
ED_screen_areas_iter (win, screen, area) {
|
||||||
{
|
|
||||||
/* set spacetype and region callbacks, calls init() */
|
/* set spacetype and region callbacks, calls init() */
|
||||||
/* sets subwindows for regions, adds handlers */
|
/* sets subwindows for regions, adds handlers */
|
||||||
ED_area_initialize(wm, win, area);
|
ED_area_initialize(wm, win, area);
|
||||||
@ -691,8 +689,7 @@ void ED_screen_set_active_region(bContext *C, wmWindow *win, const int xy[2])
|
|||||||
ARegion *region;
|
ARegion *region;
|
||||||
ARegion *region_prev = screen->active_region;
|
ARegion *region_prev = screen->active_region;
|
||||||
|
|
||||||
ED_screen_areas_iter(win, screen, area_iter)
|
ED_screen_areas_iter (win, screen, area_iter) {
|
||||||
{
|
|
||||||
if (xy[0] > area_iter->totrct.xmin && xy[0] < area_iter->totrct.xmax) {
|
if (xy[0] > area_iter->totrct.xmin && xy[0] < area_iter->totrct.xmax) {
|
||||||
if (xy[1] > area_iter->totrct.ymin && xy[1] < area_iter->totrct.ymax) {
|
if (xy[1] > area_iter->totrct.ymin && xy[1] < area_iter->totrct.ymax) {
|
||||||
if (ED_area_azones_update(area_iter, xy) == NULL) {
|
if (ED_area_azones_update(area_iter, xy) == NULL) {
|
||||||
@ -718,8 +715,7 @@ void ED_screen_set_active_region(bContext *C, wmWindow *win, const int xy[2])
|
|||||||
/* Check for redraw headers. */
|
/* Check for redraw headers. */
|
||||||
if (region_prev != screen->active_region) {
|
if (region_prev != screen->active_region) {
|
||||||
|
|
||||||
ED_screen_areas_iter(win, screen, area_iter)
|
ED_screen_areas_iter (win, screen, area_iter) {
|
||||||
{
|
|
||||||
bool do_draw = false;
|
bool do_draw = false;
|
||||||
|
|
||||||
for (region = area_iter->regionbase.first; region; region = region->next) {
|
for (region = area_iter->regionbase.first; region; region = region->next) {
|
||||||
|
@ -1741,8 +1741,7 @@ static void area_move_apply_do(const bContext *C,
|
|||||||
/* only redraw if we actually moved a screen vert, for AREAGRID */
|
/* only redraw if we actually moved a screen vert, for AREAGRID */
|
||||||
if (doredraw) {
|
if (doredraw) {
|
||||||
bool redraw_all = false;
|
bool redraw_all = false;
|
||||||
ED_screen_areas_iter(win, screen, area)
|
ED_screen_areas_iter (win, screen, area) {
|
||||||
{
|
|
||||||
if (area->v1->editflag || area->v2->editflag || area->v3->editflag || area->v4->editflag) {
|
if (area->v1->editflag || area->v2->editflag || area->v3->editflag || area->v4->editflag) {
|
||||||
if (ED_area_is_global(area)) {
|
if (ED_area_is_global(area)) {
|
||||||
/* Snap to minimum or maximum for global areas. */
|
/* Snap to minimum or maximum for global areas. */
|
||||||
@ -1761,8 +1760,7 @@ static void area_move_apply_do(const bContext *C,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (redraw_all) {
|
if (redraw_all) {
|
||||||
ED_screen_areas_iter(win, screen, area)
|
ED_screen_areas_iter (win, screen, area) {
|
||||||
{
|
|
||||||
ED_area_tag_redraw(area);
|
ED_area_tag_redraw(area);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -625,8 +625,7 @@ static void wm_draw_window_offscreen(bContext *C, wmWindow *win, bool stereo)
|
|||||||
bScreen *screen = WM_window_get_active_screen(win);
|
bScreen *screen = WM_window_get_active_screen(win);
|
||||||
|
|
||||||
/* Draw screen areas into own frame buffer. */
|
/* Draw screen areas into own frame buffer. */
|
||||||
ED_screen_areas_iter(win, screen, area)
|
ED_screen_areas_iter (win, screen, area) {
|
||||||
{
|
|
||||||
CTX_wm_area_set(C, area);
|
CTX_wm_area_set(C, area);
|
||||||
|
|
||||||
/* Compute UI layouts for dynamically size regions. */
|
/* Compute UI layouts for dynamically size regions. */
|
||||||
@ -741,8 +740,7 @@ static void wm_draw_window_onscreen(bContext *C, wmWindow *win, int view)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Blit non-overlapping area regions. */
|
/* Blit non-overlapping area regions. */
|
||||||
ED_screen_areas_iter(win, screen, area)
|
ED_screen_areas_iter (win, screen, area) {
|
||||||
{
|
|
||||||
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
|
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
|
||||||
if (region->visible && region->overlap == false) {
|
if (region->visible && region->overlap == false) {
|
||||||
/* Blit from offscreen buffer. */
|
/* Blit from offscreen buffer. */
|
||||||
@ -753,8 +751,7 @@ static void wm_draw_window_onscreen(bContext *C, wmWindow *win, int view)
|
|||||||
|
|
||||||
/* Draw paint cursors. */
|
/* Draw paint cursors. */
|
||||||
if (wm->paintcursors.first) {
|
if (wm->paintcursors.first) {
|
||||||
ED_screen_areas_iter(win, screen, area)
|
ED_screen_areas_iter (win, screen, area) {
|
||||||
{
|
|
||||||
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
|
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
|
||||||
if (region->visible && region == screen->active_region) {
|
if (region->visible && region == screen->active_region) {
|
||||||
CTX_wm_area_set(C, area);
|
CTX_wm_area_set(C, area);
|
||||||
@ -773,8 +770,7 @@ static void wm_draw_window_onscreen(bContext *C, wmWindow *win, int view)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Blend in overlapping area regions */
|
/* Blend in overlapping area regions */
|
||||||
ED_screen_areas_iter(win, screen, area)
|
ED_screen_areas_iter (win, screen, area) {
|
||||||
{
|
|
||||||
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
|
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
|
||||||
if (region->visible && region->overlap) {
|
if (region->visible && region->overlap) {
|
||||||
wm_draw_region_blend(region, 0, true);
|
wm_draw_region_blend(region, 0, true);
|
||||||
@ -914,8 +910,7 @@ static bool wm_draw_update_test_window(Main *bmain, bContext *C, wmWindow *win)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ED_screen_areas_iter(win, screen, area)
|
ED_screen_areas_iter (win, screen, area) {
|
||||||
{
|
|
||||||
for (region = area->regionbase.first; region; region = region->next) {
|
for (region = area->regionbase.first; region; region = region->next) {
|
||||||
wm_region_test_gizmo_do_draw(C, area, region, true);
|
wm_region_test_gizmo_do_draw(C, area, region, true);
|
||||||
wm_region_test_render_do_draw(scene, depsgraph, area, region);
|
wm_region_test_render_do_draw(scene, depsgraph, area, region);
|
||||||
@ -962,8 +957,7 @@ static void wm_draw_update_clear_window(bContext *C, wmWindow *win)
|
|||||||
{
|
{
|
||||||
bScreen *screen = WM_window_get_active_screen(win);
|
bScreen *screen = WM_window_get_active_screen(win);
|
||||||
|
|
||||||
ED_screen_areas_iter(win, screen, area)
|
ED_screen_areas_iter (win, screen, area) {
|
||||||
{
|
|
||||||
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
|
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
|
||||||
wm_region_test_gizmo_do_draw(C, area, region, false);
|
wm_region_test_gizmo_do_draw(C, area, region, false);
|
||||||
}
|
}
|
||||||
|
@ -524,8 +524,7 @@ void wm_event_do_notifiers(bContext *C)
|
|||||||
ED_region_do_listen(win, NULL, region, note, scene);
|
ED_region_do_listen(win, NULL, region, note, scene);
|
||||||
}
|
}
|
||||||
|
|
||||||
ED_screen_areas_iter(win, screen, area)
|
ED_screen_areas_iter (win, screen, area) {
|
||||||
{
|
|
||||||
ED_area_do_listen(win, area, note, scene);
|
ED_area_do_listen(win, area, note, scene);
|
||||||
for (region = area->regionbase.first; region; region = region->next) {
|
for (region = area->regionbase.first; region; region = region->next) {
|
||||||
ED_region_do_listen(win, area, region, note, scene);
|
ED_region_do_listen(win, area, region, note, scene);
|
||||||
@ -1655,8 +1654,7 @@ static void wm_handler_op_context(bContext *C, wmEventHandler_Op *handler, const
|
|||||||
else {
|
else {
|
||||||
ScrArea *area = NULL;
|
ScrArea *area = NULL;
|
||||||
|
|
||||||
ED_screen_areas_iter(win, screen, area_iter)
|
ED_screen_areas_iter (win, screen, area_iter) {
|
||||||
{
|
|
||||||
if (area_iter == handler->context.area) {
|
if (area_iter == handler->context.area) {
|
||||||
area = area_iter;
|
area = area_iter;
|
||||||
break;
|
break;
|
||||||
@ -2989,8 +2987,7 @@ static ScrArea *area_event_inside(bContext *C, const int xy[2])
|
|||||||
bScreen *screen = CTX_wm_screen(C);
|
bScreen *screen = CTX_wm_screen(C);
|
||||||
|
|
||||||
if (screen) {
|
if (screen) {
|
||||||
ED_screen_areas_iter(win, screen, area)
|
ED_screen_areas_iter (win, screen, area) {
|
||||||
{
|
|
||||||
if (BLI_rcti_isect_pt_v(&area->totrct, xy)) {
|
if (BLI_rcti_isect_pt_v(&area->totrct, xy)) {
|
||||||
return area;
|
return area;
|
||||||
}
|
}
|
||||||
@ -3287,8 +3284,7 @@ void wm_event_do_handlers(bContext *C)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ED_screen_areas_iter(win, screen, area)
|
ED_screen_areas_iter (win, screen, area) {
|
||||||
{
|
|
||||||
/* after restoring a screen from SCREENMAXIMIZED we have to wait
|
/* after restoring a screen from SCREENMAXIMIZED we have to wait
|
||||||
* with the screen handling till the region coordinates are updated */
|
* with the screen handling till the region coordinates are updated */
|
||||||
if (screen->skip_handling == true) {
|
if (screen->skip_handling == true) {
|
||||||
@ -3460,8 +3456,7 @@ void WM_event_add_fileselect(bContext *C, wmOperator *op)
|
|||||||
bool cancel_handler = true;
|
bool cancel_handler = true;
|
||||||
|
|
||||||
/* find the area with the file selector for this handler */
|
/* find the area with the file selector for this handler */
|
||||||
ED_screen_areas_iter(win, screen, area)
|
ED_screen_areas_iter (win, screen, area) {
|
||||||
{
|
|
||||||
if (area->spacetype == SPACE_FILE) {
|
if (area->spacetype == SPACE_FILE) {
|
||||||
SpaceFile *sfile = area->spacedata.first;
|
SpaceFile *sfile = area->spacedata.first;
|
||||||
|
|
||||||
@ -4963,8 +4958,7 @@ void WM_window_cursor_keymap_status_refresh(bContext *C, wmWindow *win)
|
|||||||
}
|
}
|
||||||
|
|
||||||
ScrArea *area = NULL;
|
ScrArea *area = NULL;
|
||||||
ED_screen_areas_iter(win, screen, area_iter)
|
ED_screen_areas_iter (win, screen, area_iter) {
|
||||||
{
|
|
||||||
if (BLI_findindex(&area_iter->regionbase, region) != -1) {
|
if (BLI_findindex(&area_iter->regionbase, region) != -1) {
|
||||||
area = area_iter;
|
area = area_iter;
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user