AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

win32: Report ScrollDC update region directly

Browse Source 
Rather than set the window update region and repaint this region
when we get a WM_PAINT we just directly add it to the update
region. No need to roundtrip via win32.

This lets us also make sure we do this drawing in the same update
cycle. This seems especially important on Win7, because ScrollDC
seems to act kind of weird there, not using bitblt in areas where
it seemingly could, which makes scrolling look really flashy.

http://bugzilla.gnome.org/show_bug-cgi?id=674051
This commit is contained in:
Alexander Larsson 2013-04-10 14:25:26 +02:00
parent 4f27256306
commit ea66a8a580
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gdk/win32/gdkdrawable-win32.c
View File

@ -1560,21 +1560,28 @@ blit_inside_drawable (HDC hdc,
* scrolling a window that is partially obscured by another window. For * scrolling a window that is partially obscured by another window. For
* example, GIMP's toolbox being over the editor window. */ * example, GIMP's toolbox being over the editor window. */
RECT scrollRect, emptyRect; RECT emptyRect, clipRect;
HRGN updateRgn; HRGN updateRgn;
GdkRegion *update_region;
scrollRect.left = MIN (xsrc, xdest); clipRect.left = xdest;
scrollRect.top = MIN (ysrc, ydest); clipRect.top = ydest;
scrollRect.right = MAX (xsrc + width + 1, xdest + width + 1); clipRect.right = xdest + width;
scrollRect.bottom = MAX (ysrc + height + 1, ydest + height + 1); clipRect.bottom = ydest + height;
SetRectEmpty (&emptyRect); SetRectEmpty (&emptyRect);
updateRgn = CreateRectRgnIndirect (&emptyRect); updateRgn = CreateRectRgnIndirect (&emptyRect);
if (!ScrollDC (hdc, xdest - xsrc, ydest - ysrc, &scrollRect, NULL, updateRgn, NULL)) if (!ScrollDC (hdc, xdest - xsrc, ydest - ysrc, NULL, &clipRect, updateRgn, NULL))
WIN32_GDI_FAILED ("ScrollDC"); WIN32_GDI_FAILED ("ScrollDC");
else if (!InvalidateRgn (src->handle, updateRgn, FALSE)) else
WIN32_GDI_FAILED ("InvalidateRgn"); {
GdkDrawable *wrapper = src->wrapper;
update_region = _gdk_win32_hrgn_to_region (updateRgn);
if (!gdk_region_empty (update_region))
_gdk_window_invalidate_for_expose (GDK_WINDOW (wrapper), update_region);
gdk_region_destroy (update_region);
}
if (!DeleteObject (updateRgn)) if (!DeleteObject (updateRgn))
WIN32_GDI_FAILED ("DeleteObject"); WIN32_GDI_FAILED ("DeleteObject");