[ros-diffs] [fireball] 46872: - Enable clipped text output. Solves issues like caption text being printed outside of window's caption when window is being made too small.

Author: fireball
Date: Wed Apr 14 22:37:43 2010
New Revision: 46872

URL: http://svn.reactos.org/svn/reactos?rev=46872&view=rev
Log:
- Enable clipped text output. Solves issues like caption text being printed outside of
window's caption when window is being made too small.

Modified:
    branches/arwinss/reactos/dll/win32/winent.drv/font.c
    branches/arwinss/reactos/dll/win32/winent.drv/winent.h

Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] Wed Apr 14 22:37:43
2010
@@ -586,7 +586,7 @@
     BOOL retv = FALSE;
     //HDC hdc = physDev->hUserDC;
     //int textPixel, backgroundPixel;
-    //HRGN saved_region = 0;
+    HRGN saved_region = 0;
     BOOL disable_antialias = FALSE;
     AA_Type aa_type = AA_None;
     //DIBSECTION bmp;
@@ -662,12 +662,10 @@
         HRGN clip_region;
 
         clip_region = CreateRectRgnIndirect( lprect );
-#if 0
         /* make a copy of the current device region */
         saved_region = CreateRectRgn( 0, 0, 0, 0 );
         CombineRgn( saved_region, physDev->region, 0, RGN_COPY );
         RosDrv_SetDeviceClipping( physDev, saved_region, clip_region );
-#endif
         DeleteObject( clip_region );
     }
 
@@ -848,10 +846,8 @@
     if (flags & ETO_CLIPPED)
     {
         /* restore the device region */
-#if 0
         RosDrv_SetDeviceClipping( physDev, saved_region, 0 );
         DeleteObject( saved_region );
-#endif
     }
 
     retv = TRUE;

Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Wed Apr 14
22:37:43 2010
@@ -45,6 +45,7 @@
 int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width,
                               LONG *height, WORD *bpp, WORD *compr );
 
+void CDECL RosDrv_SetDeviceClipping( NTDRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn
);
 
 /* font.c */
 VOID