diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 8 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index e3c5161463b..39bc31c35cf 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -664,15 +664,15 @@ static void screen_test_scale(bScreen *sc, int winsizex, int winsizey) * need some way to store these as floats internally and re-apply from there. */ tempf = ((float)sv->vec.x) * facx; sv->vec.x = (short)(tempf + 0.5f); - sv->vec.x += AREAGRID - 1; - sv->vec.x -= (sv->vec.x % AREAGRID); + //sv->vec.x += AREAGRID - 1; + //sv->vec.x -= (sv->vec.x % AREAGRID); CLAMP(sv->vec.x, 0, winsizex); tempf = ((float)sv->vec.y) * facy; sv->vec.y = (short)(tempf + 0.5f); - sv->vec.y += AREAGRID - 1; - sv->vec.y -= (sv->vec.y % AREAGRID); + //sv->vec.y += AREAGRID - 1; + //sv->vec.y -= (sv->vec.y % AREAGRID); CLAMP(sv->vec.y, 0, winsizey); } diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index fe419010780..282e14cc5fe 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -900,6 +900,13 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr C_void_ptr wm_draw_window_clear(win); WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL); WM_event_add_notifier(C, NC_WINDOW | NA_EDITED, NULL); + +#if defined(__APPLE__) + /* OSX doesn't return to the mainloop while resize */ + wm_event_do_handlers(C); + wm_event_do_notifiers(C); + wm_draw_update(C); +#endif } } break; |