fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-06-10 23:06 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com

Browse Source 
* harbour/source/rtl/gtwvt/gtwvt.c
     ! Fixed maximized state. Borders were missing.
     - Removed functionality to force Windows not to show Windows contents while resizing. 
       ; Instead application can issue :
          To switch off full drag  
             DllCall( "user32.dll", NIL, "SystemParametersInfo", 37, 0, 0, 0 )
          To switch on full drag  
             DllCall( "user32.dll", NIL, "SystemParametersInfo", 37, 1, 0, 0 )
      ! Fixed non-refreshed client area under certain circumstances.
      * Removed all the hacks to adjust borders.
      * Adjusted maximize operation - now window is centered on the screen.
      ; TODO - Find a better solution to 
        enabling and disabling of resizing feature at run time.
This commit is contained in:
Pritpal Bedi
2008-06-11 06:20:07 +00:00
parent 8d0a5f3542
commit f23b31139f
2 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -8,6 +8,21 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-06-10 23:06 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com
* harbour/source/rtl/gtwvt/gtwvt.c
! Fixed maximized state. Borders were missing.
- Removed functionality to force Windows not to show Windows contents while resizing.
; Instead application can issue :
To switch off full drag
DllCall( "user32.dll", NIL, "SystemParametersInfo", 37, 0, 0, 0 )
To switch on full drag
DllCall( "user32.dll", NIL, "SystemParametersInfo", 37, 1, 0, 0 )
! Fixed non-refreshed client area under certain circumstances.
* Removed all the hacks to adjust borders.
* Adjusted maximize operation - now window is centered on the screen.
; TODO - Find a better solution to
enabling and disabling of resizing feature at run time.
2008-06-11 04:10 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbexprop.h
* harbour/include/hbexprb.c

36
harbour/source/rtl/gtwvt/gtwvt.c
View File

@@ -489,8 +489,8 @@ static void hb_gt_wvt_FitSize( PHB_GTWVT pWVT, USHORT mode )
{
SystemParametersInfo( SPI_GETWORKAREA, 0, &wi, 0 );
maxHeight = wi.bottom;// - wi.top - borderwidth;
maxWidth = wi.right;// - wi.left - borderheight;
maxHeight = wi.bottom - wi.top - borderwidth;
maxWidth = wi.right - wi.left - borderheight;
left = 0;
top = 0;
@@ -525,10 +525,10 @@ static void hb_gt_wvt_FitSize( PHB_GTWVT pWVT, USHORT mode )
SelectObject( hdc, hOldFont );
ReleaseDC( pWVT->hWnd, hdc );
width = ( tm.tmAveCharWidth * pWVT->COLS );
height = ( ( tm.tmHeight - ( pWVT->bMaximized ? 1 : 0 ) ) * pWVT->ROWS );
width = ( tm.tmAveCharWidth * pWVT->COLS );
height = ( tm.tmHeight * pWVT->ROWS );
if( width <= maxWidth && height <= maxHeight )
//if( width <= maxWidth && height <= maxHeight )
{
if( pWVT->hFont )
DeleteObject( pWVT->hFont );
@@ -538,7 +538,7 @@ static void hb_gt_wvt_FitSize( PHB_GTWVT pWVT, USHORT mode )
pWVT->fontWidth = tm.tmAveCharWidth;
pWVT->PTEXTSIZE.x = tm.tmAveCharWidth;
pWVT->PTEXTSIZE.y = tm.tmHeight - ( pWVT->bMaximized ? 1 : 0 ); /* Hack to Disp MaxRow Correctly */
pWVT->PTEXTSIZE.y = tm.tmHeight;
#if defined(HB_WINCE)
pWVT->FixedFont = FALSE;
@@ -550,9 +550,15 @@ static void hb_gt_wvt_FitSize( PHB_GTWVT pWVT, USHORT mode )
for( n = 0; n < pWVT->COLS; n++ )
pWVT->FixedSize[ n ] = pWVT->PTEXTSIZE.x;
width = ( ( USHORT ) ( pWVT->PTEXTSIZE.x * pWVT->COLS ) ) + ( pWVT->bMaximized ? 0 : borderwidth );
width = ( ( USHORT ) ( pWVT->PTEXTSIZE.x * pWVT->COLS ) ) + borderwidth;
height = ( ( USHORT ) ( pWVT->PTEXTSIZE.y * pWVT->ROWS ) ) + borderheight;
if( pWVT->bMaximized )
{
left = ( ( wi.right - width ) / 2 );
top = ( ( wi.bottom - height ) / 2 );
}
hb_gt_wvt_KillCaret( pWVT );
hb_gt_wvt_UpdateCaret( pWVT );
@@ -1510,12 +1516,11 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
hb_gt_wvt_FireEvent( pWVT, ( LOWORD( wParam ) == WA_INACTIVE ? HB_GTE_KILLFOCUS : HB_GTE_SETFOCUS ) );
return 0;
case WM_ENTERSIZEMOVE:
return 0;
case WM_EXITSIZEMOVE:
if( !pWVT->bMaximized )
{
hb_gt_wvt_FitSize( pWVT, 0 );
hb_gt_wvt_FireEvent( pWVT, HB_GTE_RESIZED );
}
hb_gt_wvt_FireEvent( pWVT, HB_GTE_RESIZED );
return 0;
case WM_SIZE:
@@ -1721,10 +1726,6 @@ static void hb_gt_wvt_Init( PHB_GT pGT, FHANDLE hFilenoStdin, FHANDLE hFilenoStd
AppendMenu( hSysMenu, MF_STRING, SYS_EV_MARK, "Mark and Copy" );
}
/* Force Windows not to show dragged windows contents */
/* If desired it can be controlled via HB_GTI_SETDRAGFULLWINDOW or something like */
SystemParametersInfo( SPI_SETDRAGFULLWINDOWS, 0, NULL, SPIF_UPDATEINIFILE | SPIF_SENDWININICHANGE );
/* SUPER GT initialization */
HB_GTSUPER_INIT( pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr );
HB_GTSELF_RESIZE( pGT, pWVT->ROWS, pWVT->COLS );
@@ -2262,13 +2263,14 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
else
style = WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX|WS_BORDER;
pWVT->bResizable = bNewValue;
SetWindowLongPtr( pWVT->hWnd, GWL_STYLE, style );
SetWindowPos( pWVT->hWnd, NULL, 0, 0, 0, 0,
SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE |
SWP_NOSIZE | SWP_NOZORDER | SWP_DEFERERASE );
ShowWindow( pWVT->hWnd, SW_HIDE );
ShowWindow( pWVT->hWnd, SW_NORMAL );
pWVT->bResizable = bNewValue;
}
}
break;