* make function to map mouse into region coords

diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index be36b2a39b6a79edeb53353ae4d5ef3181dbe178..84525fc30466a661c1ff06f3ee86138b15b89a42 100644 (file)
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -185,6 +185,12 @@ void ui_window_to_block(const ARegion *ar, uiBlock *block, int *x, int *y)
        *y= (int)(fy+0.5f);
 }
 
+void ui_window_to_region(const ARegion *ar, int *x, int *y)
+{
+       *x-= ar->winrct.xmin;
+       *y-= ar->winrct.ymin;
+}
+
 /* ******************* block calc ************************* */
 
 /* only for pulldowns */

diff --git a/source/blender/editors/interface/interface.h b/source/blender/editors/interface/interface.h
index 2df65e3ef3b011e3bd40ef1bda61cb7863976d1d..4233e635b566d03c95f9f556ceb15b8a5dc0647c 100644 (file)
--- a/source/blender/editors/interface/interface.h
+++ b/source/blender/editors/interface/interface.h
@@ -244,6 +244,7 @@ extern void ui_block_to_window(const struct ARegion *ar, uiBlock *block, int *x,
 extern void ui_block_to_window_rct(const struct ARegion *ar, uiBlock *block, rctf *graph, rcti *winr);
 extern void ui_window_to_block_fl(const struct ARegion *ar, uiBlock *block, float *x, float *y);
 extern void ui_window_to_block(const struct ARegion *ar, uiBlock *block, int *x, int *y);
+extern void ui_window_to_region(const ARegion *ar, int *x, int *y);
 
 extern double ui_get_but_val(uiBut *but);
 extern void ui_set_but_val(uiBut *but, double value);

diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index d96deefa39edf566a8e7e98162c1c893a40b33be..32bebab21800c2db62df1ef3c1f7c6ade4a6fc9b 100644 (file)
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -2595,8 +2595,10 @@ static int inside_region(ARegion *ar, int x, int y)
        if(BLI_in_rcti(&ar->winrct, x, y)) {
                /* XXX still can be zero */
                if(ar->v2d.mask.xmin!=ar->v2d.mask.xmax) {
-                       /* mask is in different coord space - take that in account */
-                       return BLI_in_rcti(&ar->v2d.mask, x-ar->winrct.xmin, y-ar->winrct.ymin);
+                       int arx = x;
+                       int ary = y;
+                       ui_window_to_region(ar, &arx, &ary);
+                       return BLI_in_rcti(&ar->v2d.mask, arx, ary);
                }
                return 1;
        }