From d7b0567f7c9f52383eb91d5e6b96aa9fd65ee1a5 Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Thu, 26 Aug 2021 13:26:31 -0300 Subject: Cleanup: return window in 'WM_window_find_under_cursor' This better matches other functions like `BKE_screen_find_area_xy`. --- source/blender/editors/interface/interface_eyedropper_color.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source/blender/editors/interface/interface_eyedropper_color.c') diff --git a/source/blender/editors/interface/interface_eyedropper_color.c b/source/blender/editors/interface/interface_eyedropper_color.c index ba72cecc514..a8542c47fc2 100644 --- a/source/blender/editors/interface/interface_eyedropper_color.c +++ b/source/blender/editors/interface/interface_eyedropper_color.c @@ -342,15 +342,13 @@ void eyedropper_color_sample_fl(bContext *C, int mx, int my, float r_col[3]) ScrArea *area = BKE_screen_find_area_xy(screen, SPACE_TYPE_ANY, mx, my); if (area == NULL) { int mval[2] = {mx, my}; - if (WM_window_find_under_cursor(wm, NULL, win, mval, &win, mval)) { + win = WM_window_find_under_cursor(wm, NULL, win, mval, mval); + if (win) { mx = mval[0]; my = mval[1]; screen = WM_window_get_active_screen(win); area = BKE_screen_find_area_xy(screen, SPACE_TYPE_ANY, mx, my); } - else { - win = NULL; - } } if (area) { -- cgit v1.2.3 From aadbdb80484c374f054c23502c76511be588fd77 Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Thu, 26 Aug 2021 14:12:21 -0300 Subject: Cleanup: split eyedropper_color_sample_fl into more specific utilities The window and region find utility can be used in other eyedropper operators. --- .../editors/interface/interface_eyedropper_color.c | 36 ++++++++-------------- 1 file changed, 13 insertions(+), 23 deletions(-) (limited to 'source/blender/editors/interface/interface_eyedropper_color.c') diff --git a/source/blender/editors/interface/interface_eyedropper_color.c b/source/blender/editors/interface/interface_eyedropper_color.c index a8542c47fc2..9d06fb2b27a 100644 --- a/source/blender/editors/interface/interface_eyedropper_color.c +++ b/source/blender/editors/interface/interface_eyedropper_color.c @@ -337,50 +337,41 @@ void eyedropper_color_sample_fl(bContext *C, int mx, int my, float r_col[3]) const char *display_device = CTX_data_scene(C)->display_settings.display_device; struct ColorManagedDisplay *display = IMB_colormanagement_display_get_named(display_device); - wmWindow *win = CTX_wm_window(C); - bScreen *screen = CTX_wm_screen(C); - ScrArea *area = BKE_screen_find_area_xy(screen, SPACE_TYPE_ANY, mx, my); - if (area == NULL) { - int mval[2] = {mx, my}; - win = WM_window_find_under_cursor(wm, NULL, win, mval, mval); - if (win) { - mx = mval[0]; - my = mval[1]; - screen = WM_window_get_active_screen(win); - area = BKE_screen_find_area_xy(screen, SPACE_TYPE_ANY, mx, my); - } - } + wmWindow *win; + ScrArea *area; + int mval[2] = {mx, my}; + datadropper_win_area_find(C, mval, mval, &win, &area); if (area) { if (area->spacetype == SPACE_IMAGE) { - ARegion *region = BKE_area_find_region_xy(area, RGN_TYPE_WINDOW, mx, my); + ARegion *region = BKE_area_find_region_xy(area, RGN_TYPE_WINDOW, mval[0], mval[1]); if (region) { SpaceImage *sima = area->spacedata.first; - int mval[2] = {mx - region->winrct.xmin, my - region->winrct.ymin}; + int region_mval[2] = {mval[0] - region->winrct.xmin, mval[1] - region->winrct.ymin}; - if (ED_space_image_color_sample(sima, region, mval, r_col, NULL)) { + if (ED_space_image_color_sample(sima, region, region_mval, r_col, NULL)) { return; } } } else if (area->spacetype == SPACE_NODE) { - ARegion *region = BKE_area_find_region_xy(area, RGN_TYPE_WINDOW, mx, my); + ARegion *region = BKE_area_find_region_xy(area, RGN_TYPE_WINDOW, mval[0], mval[1]); if (region) { SpaceNode *snode = area->spacedata.first; - const int mval[2] = {mx - region->winrct.xmin, my - region->winrct.ymin}; + int region_mval[2] = {mval[0] - region->winrct.xmin, mval[1] - region->winrct.ymin}; - if (ED_space_node_color_sample(bmain, snode, region, mval, r_col)) { + if (ED_space_node_color_sample(bmain, snode, region, region_mval, r_col)) { return; } } } else if (area->spacetype == SPACE_CLIP) { - ARegion *region = BKE_area_find_region_xy(area, RGN_TYPE_WINDOW, mx, my); + ARegion *region = BKE_area_find_region_xy(area, RGN_TYPE_WINDOW, mval[0], mval[1]); if (region) { SpaceClip *sc = area->spacedata.first; - int mval[2] = {mx - region->winrct.xmin, my - region->winrct.ymin}; + int region_mval[2] = {mval[0] - region->winrct.xmin, mval[1] - region->winrct.ymin}; - if (ED_space_clip_color_sample(sc, region, mval, r_col)) { + if (ED_space_clip_color_sample(sc, region, region_mval, r_col)) { return; } } @@ -389,7 +380,6 @@ void eyedropper_color_sample_fl(bContext *C, int mx, int my, float r_col[3]) if (win) { /* Fallback to simple opengl picker. */ - const int mval[2] = {mx, my}; WM_window_pixel_sample_read(wm, win, mval, r_col); IMB_colormanagement_display_to_scene_linear_v3(r_col, display); } -- cgit v1.2.3