diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-23 00:34:11 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-23 14:42:43 +0300 |
| commit | ede19477c825a52aaca224eb72fd708adc7871f9 (patch) | |
| tree | 9094d21a8f2505a66bea44ed302ed2c626508c40 /source/blender/editors/screen | |
| parent | 46a0e72540ab3515c971ed9be044d52424827f0a (diff) | |
Fix T54765: build error on macOS.
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/area.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 588a2abec53..00b70dc9f66 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -660,13 +660,6 @@ static void area_azone_initialize(wmWindow *win, const bScreen *screen, ScrArea return; } - /* can't click on bottom corners on OS X, already used for resizing */ -#ifdef __APPLE__ - if (!(sa->totrct.xmin == 0 && sa->totrct.ymin == 0) || WM_window_is_fullscreen(win)) -#else - (void)win; -#endif - float coords[4][4] = { /* Bottom-left. */ {sa->totrct.xmin, @@ -690,6 +683,17 @@ static void area_azone_initialize(wmWindow *win, const bScreen *screen, ScrArea sa->totrct.ymax - (AZONESPOT - 1)}}; for (int i = 0; i < 4; i++) { + /* can't click on bottom corners on OS X, already used for resizing */ +#ifdef __APPLE__ + if (!WM_window_is_fullscreen(win) && + ((coords[i][0] == 0 && coords[i][1] == 0) || + (coords[i][0] == WM_window_pixels_x(win) && coords[i][1] == 0))) { + continue; + } +#else + (void)win; +#endif + /* set area action zones */ az = (AZone *)MEM_callocN(sizeof(AZone), "actionzone"); BLI_addtail(&(sa->actionzones), az); |