From 5afc2a9a4457b99be29dde1af1f2deda3de186f3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 11 Dec 2013 12:42:04 +1100 Subject: Code cleanup: assign win size to const vars and some renaming --- source/blender/windowmanager/intern/wm_dragdrop.c | 12 ++++++------ source/blender/windowmanager/intern/wm_draw.c | 15 +++++++++------ source/blender/windowmanager/intern/wm_gesture.c | 12 ++++++------ source/blender/windowmanager/intern/wm_subwindow.c | 11 +++++++---- 4 files changed, 28 insertions(+), 22 deletions(-) (limited to 'source/blender/windowmanager') diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c index 819ec365e09..dad8e7bdde0 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.c +++ b/source/blender/windowmanager/intern/wm_dragdrop.c @@ -217,11 +217,11 @@ static const char *wm_dropbox_active(bContext *C, wmDrag *drag, wmEvent *event) static void wm_drop_operator_options(bContext *C, wmDrag *drag, wmEvent *event) { wmWindow *win = CTX_wm_window(C); - int winsizex = WM_window_pixels_x(win); - int winsizey = WM_window_pixels_y(win); + const int winsize_x = WM_window_pixels_x(win); + const int winsize_y = WM_window_pixels_y(win); /* for multiwin drags, we only do this if mouse inside */ - if (event->x < 0 || event->y < 0 || event->x > winsizex || event->y > winsizey) + if (event->x < 0 || event->y < 0 || event->x > winsize_x || event->y > winsize_y) return; drag->opname[0] = 0; @@ -304,7 +304,7 @@ void wm_drags_draw(bContext *C, wmWindow *win, rcti *rect) { wmWindowManager *wm = CTX_wm_manager(C); wmDrag *drag; - int winsizey = WM_window_pixels_y(win); + const int winsize_y = WM_window_pixels_y(win); int cursorx, cursory, x, y; cursorx = win->eventstate->x; @@ -366,7 +366,7 @@ void wm_drags_draw(bContext *C, wmWindow *win, rcti *rect) if (drag->imb) { x = cursorx - drag->sx / 2; - if (cursory + drag->sy / 2 + padding + iconsize < winsizey) + if (cursory + drag->sy / 2 + padding + iconsize < winsize_y) y = cursory + drag->sy / 2 + padding; else y = cursory - drag->sy / 2 - padding - iconsize - padding - iconsize; @@ -374,7 +374,7 @@ void wm_drags_draw(bContext *C, wmWindow *win, rcti *rect) else { x = cursorx - 2 * padding; - if (cursory + iconsize + iconsize < winsizey) + if (cursory + iconsize + iconsize < winsize_y) y = cursory + iconsize; else y = cursory - iconsize - 2 * UI_DPI_FAC; diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index dac62d624b5..5edc57be40b 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -429,6 +429,9 @@ static void wm_draw_triple_fail(bContext *C, wmWindow *win) static int wm_triple_gen_textures(wmWindow *win, wmDrawTriple *triple) { + const int winsize_x = WM_window_pixels_x(win); + const int winsize_y = WM_window_pixels_y(win); + GLint maxsize; int x, y; @@ -437,22 +440,22 @@ static int wm_triple_gen_textures(wmWindow *win, wmDrawTriple *triple) triple->target = GL_TEXTURE_RECTANGLE_ARB; triple->nx = 1; triple->ny = 1; - triple->x[0] = WM_window_pixels_x(win); - triple->y[0] = WM_window_pixels_y(win); + triple->x[0] = winsize_x; + triple->y[0] = winsize_y; } else if (GPU_non_power_of_two_support()) { triple->target = GL_TEXTURE_2D; triple->nx = 1; triple->ny = 1; - triple->x[0] = WM_window_pixels_x(win); - triple->y[0] = WM_window_pixels_y(win); + triple->x[0] = winsize_x; + triple->y[0] = winsize_y; } else { triple->target = GL_TEXTURE_2D; triple->nx = 0; triple->ny = 0; - split_width(WM_window_pixels_x(win), MAX_N_TEX, triple->x, &triple->nx); - split_width(WM_window_pixels_y(win), MAX_N_TEX, triple->y, &triple->ny); + split_width(winsize_x, MAX_N_TEX, triple->x, &triple->nx); + split_width(winsize_y, MAX_N_TEX, triple->y, &triple->ny); } /* generate texture names */ diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index 4d4d46d063a..33758d9699d 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -329,19 +329,19 @@ static void wm_gesture_draw_lasso(wmWindow *win, wmGesture *gt, bool filled) static void wm_gesture_draw_cross(wmWindow *win, wmGesture *gt) { rcti *rect = (rcti *)gt->customdata; - int winsizex = WM_window_pixels_x(win); - int winsizey = WM_window_pixels_y(win); + const int winsize_x = WM_window_pixels_x(win); + const int winsize_y = WM_window_pixels_y(win); glEnable(GL_LINE_STIPPLE); glColor3ub(96, 96, 96); glLineStipple(1, 0xCCCC); - sdrawline(rect->xmin - winsizex, rect->ymin, rect->xmin + winsizex, rect->ymin); - sdrawline(rect->xmin, rect->ymin - winsizey, rect->xmin, rect->ymin + winsizey); + sdrawline(rect->xmin - winsize_x, rect->ymin, rect->xmin + winsize_x, rect->ymin); + sdrawline(rect->xmin, rect->ymin - winsize_y, rect->xmin, rect->ymin + winsize_y); glColor3ub(255, 255, 255); glLineStipple(1, 0x3333); - sdrawline(rect->xmin - winsizex, rect->ymin, rect->xmin + winsizex, rect->ymin); - sdrawline(rect->xmin, rect->ymin - winsizey, rect->xmin, rect->ymin + winsizey); + sdrawline(rect->xmin - winsize_x, rect->ymin, rect->xmin + winsize_x, rect->ymin); + sdrawline(rect->xmin, rect->ymin - winsize_y, rect->xmin, rect->ymin + winsize_y); glDisable(GL_LINE_STIPPLE); } diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c index ae535ed45e8..75608a850ac 100644 --- a/source/blender/windowmanager/intern/wm_subwindow.c +++ b/source/blender/windowmanager/intern/wm_subwindow.c @@ -209,6 +209,9 @@ void wm_subwindow_position(wmWindow *win, int swinid, rcti *winrct) wmSubWindow *swin = swin_from_swinid(win, swinid); if (swin) { + const int winsize_x = WM_window_pixels_x(win); + const int winsize_y = WM_window_pixels_y(win); + int width, height; swin->winrct = *winrct; @@ -226,10 +229,10 @@ void wm_subwindow_position(wmWindow *win, int swinid, rcti *winrct) * fixed it). - zr (2001!) */ - if (swin->winrct.xmax > WM_window_pixels_x(win)) - swin->winrct.xmax = WM_window_pixels_x(win); - if (swin->winrct.ymax > WM_window_pixels_y(win)) - swin->winrct.ymax = WM_window_pixels_y(win); + if (swin->winrct.xmax > winsize_x) + swin->winrct.xmax = winsize_x; + if (swin->winrct.ymax > winsize_y) + swin->winrct.ymax = winsize_y; /* extra service */ wmSubWindowSet(win, swinid); -- cgit v1.2.3