diff options
Diffstat (limited to 'source/blender/windowmanager/intern/wm_subwindow.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_subwindow.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c index 9b46dced6bc..01bebe8a1b8 100644 --- a/source/blender/windowmanager/intern/wm_subwindow.c +++ b/source/blender/windowmanager/intern/wm_subwindow.c @@ -217,10 +217,10 @@ void wm_subwindow_position(wmWindow *win, int swinid, rcti *winrct) * fixed it). - zr (2001!) */ - if (swin->winrct.xmax > win->sizex) - swin->winrct.xmax = win->sizex; - if (swin->winrct.ymax > win->sizey) - swin->winrct.ymax = win->sizey; + 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); /* extra service */ wmSubWindowSet(win, swinid); @@ -255,22 +255,21 @@ void wmSubWindowScissorSet(wmWindow *win, int swinid, rcti *srct) 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_rcti_size_x(srct) + 1; - height = BLI_rcti_size_y(srct) + 1; - glScissor(srct->xmin, srct->ymin, width, height); + int scissor_width = BLI_rcti_size_x(srct) + 1; /* only here */ + int scissor_height = BLI_rcti_size_y(srct) + 1; + glScissor(srct->xmin, srct->ymin, scissor_width, scissor_height); } else glScissor(_curswin->winrct.xmin, _curswin->winrct.ymin, width, height); wmOrtho2(-GLA_PIXEL_OFS, (float)width - GLA_PIXEL_OFS, -GLA_PIXEL_OFS, (float)height - GLA_PIXEL_OFS); glLoadIdentity(); - + glFlush(); } - /* enable the WM versions of opengl calls */ void wmSubWindowSet(wmWindow *win, int swinid) { |