From bea364fe2a37222fc8737afdb508ca81e1b89e68 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Mon, 2 Jul 2018 16:48:18 +0200 Subject: Fix: Global area edges couldn't call right click menu to join/split Operators ignored edges along the screen-layout bounds. They should've ignored those along window bounds instead. Although the global areas can not be joined/split, the adjacent areas can. So the menu should still be shown. Had to change the return value of area joining operator, so that an error report can show up when trying to join over a global area edge. Think this is fine to do, but you never know with such stuff. Preferably we'd gray out the "Join Area" item in the menu when clicking on the edge of a global area. Unfotunately the operator uses coordinates passed as operator properties to find the right edge/areas, which we cannot access from the poll callback. --- source/blender/blenkernel/BKE_screen.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender/blenkernel/BKE_screen.h') diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h index b6ddb8f57be..861b47aebc6 100644 --- a/source/blender/blenkernel/BKE_screen.h +++ b/source/blender/blenkernel/BKE_screen.h @@ -333,6 +333,7 @@ struct ARegion *BKE_area_find_region_active_win(struct ScrArea *sa); struct ARegion *BKE_area_find_region_xy(struct ScrArea *sa, const int regiontype, int x, int y); struct ScrArea *BKE_screen_find_area_from_space(struct bScreen *sc, struct SpaceLink *sl) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2); struct ScrArea *BKE_screen_find_big_area(struct bScreen *sc, const int spacetype, const short min); +struct ScrArea *BKE_screen_area_map_find_area_xy(const struct ScrAreaMap *areamap, const int spacetype, int x, int y); struct ScrArea *BKE_screen_find_area_xy(struct bScreen *sc, const int spacetype, int x, int y); unsigned int BKE_screen_view3d_layer_active_ex( -- cgit v1.2.3