diff options
Diffstat (limited to 'source/blender/windowmanager/intern')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_gesture.c | 4 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_subwindow.c | 12 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index 2928ba024e5..b3ffb80243a 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -130,8 +130,8 @@ int wm_gesture_evaluate(wmGesture *gesture) { if (gesture->type == WM_GESTURE_TWEAK) { rcti *rect = gesture->customdata; - int dx = BLI_RCT_SIZE_X(rect); - int dy = BLI_RCT_SIZE_Y(rect); + int dx = BLI_rcti_size_x(rect); + int dy = BLI_rcti_size_y(rect); if (ABS(dx) + ABS(dy) > U.tweak_threshold) { int theta = (int)floor(4.0f * atan2f((float)dy, (float)dx) / (float)M_PI + 0.5f); int val = EVT_GESTURE_W; diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c index adf54af240b..4078a88b2fd 100644 --- a/source/blender/windowmanager/intern/wm_subwindow.c +++ b/source/blender/windowmanager/intern/wm_subwindow.c @@ -116,8 +116,8 @@ void wm_subwindow_getsize(wmWindow *win, int swinid, int *x, int *y) wmSubWindow *swin = swin_from_swinid(win, swinid); if (swin) { - *x = BLI_RCT_SIZE_X(&swin->winrct) + 1; - *y = BLI_RCT_SIZE_Y(&swin->winrct) + 1; + *x = BLI_rcti_size_x(&swin->winrct) + 1; + *y = BLI_rcti_size_y(&swin->winrct) + 1; } } @@ -256,13 +256,13 @@ void wmSubWindowScissorSet(wmWindow *win, int swinid, rcti *srct) win->curswin = _curswin; _curwindow = win; - width = BLI_RCT_SIZE_X(&_curswin->winrct) + 1; - height = BLI_RCT_SIZE_Y(&_curswin->winrct) + 1; + width = BLI_rcti_size_x(&_curswin->winrct) + 1; + height = BLI_rcti_size_y(&_curswin->winrct) + 1; glViewport(_curswin->winrct.xmin, _curswin->winrct.ymin, width, height); if (srct) { - width = BLI_RCT_SIZE_X(srct) + 1; - height = BLI_RCT_SIZE_Y(srct) + 1; + width = BLI_rcti_size_x(srct) + 1; + height = BLI_rcti_size_y(srct) + 1; glScissor(srct->xmin, srct->ymin, width, height); } else diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 59c8235faf0..18072d805fc 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -458,8 +458,8 @@ wmWindow *WM_window_open(bContext *C, rcti *rect) win->posx = rect->xmin; win->posy = rect->ymin; - win->sizex = BLI_RCT_SIZE_X(rect); - win->sizey = BLI_RCT_SIZE_Y(rect); + win->sizex = BLI_rcti_size_x(rect); + win->sizey = BLI_rcti_size_y(rect); win->drawmethod = -1; win->drawdata = NULL; @@ -494,8 +494,8 @@ void WM_window_open_temp(bContext *C, rcti *position, int type) win->posy = position->ymin; } - win->sizex = BLI_RCT_SIZE_X(position); - win->sizey = BLI_RCT_SIZE_Y(position); + win->sizex = BLI_rcti_size_x(position); + win->sizey = BLI_rcti_size_y(position); if (win->ghostwin) { wm_window_set_size(win, win->sizex, win->sizey); |