Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-01-11 05:29:55 +00:00
Code Issues Projects Releases Wiki Activity

[Bug #018852] Fix redraw issue with 2x to 1x windowed mode:

Browse Source 
. Invalidate old rect region
This commit is contained in:
tomch 2013-01-05 22:01:15 +00:00
parent f13fc6ddb2
commit 989930aa3e
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
AppleWin/source/Frame.cpp
View File

@ -139,7 +139,8 @@ bool g_bFreshReset = false;
static void UpdateMouseInAppleViewport(int iOutOfBoundsX, int iOutOfBoundsY, int x=0, int y=0); static void UpdateMouseInAppleViewport(int iOutOfBoundsX, int iOutOfBoundsY, int x=0, int y=0);
static void ScreenWindowResize(const bool bCtrlKey); static void ScreenWindowResize(const bool bCtrlKey);
static void DoFrameResizeWindow(int nNewScale); static void DoFrameResizeWindow(int nNewScale);
static void FrameResizeWindow(void); static void GetWidthHeight(int& nWidth, int& nHeight);
static void FrameResizeWindow(int nOldWidth, int nOldHeight);
TCHAR g_pAppleWindowTitle[ 128 ] = ""; TCHAR g_pAppleWindowTitle[ 128 ] = "";
@ -1865,8 +1866,11 @@ void SetViewportScale(int nNewScale)
static void DoFrameResizeWindow(int nNewScale) static void DoFrameResizeWindow(int nNewScale)
{ {
int nOldWidth, nOldHeight;
GetWidthHeight(nOldWidth, nOldHeight);
SetViewportScale(nNewScale); SetViewportScale(nNewScale);
FrameResizeWindow(); FrameResizeWindow(nOldWidth, nOldHeight);
} }
static void SetupTooltipControls(void) static void SetupTooltipControls(void)
@ -1889,13 +1893,7 @@ static void SetupTooltipControls(void)
SendMessage(tooltipwindow, TTM_ADDTOOL, 0, (LPARAM)&toolinfo); SendMessage(tooltipwindow, TTM_ADDTOOL, 0, (LPARAM)&toolinfo);
} }
// static void GetWidthHeight(int& nWidth, int& nHeight)
// ----- ALL GLOBALLY ACCESSIBLE FUNCTIONS ARE BELOW THIS LINE -----
//
//===========================================================================
void GetWidthHeight(int& nWidth, int& nHeight)
{ {
nWidth = g_nViewportCX + VIEWPORTX*2 nWidth = g_nViewportCX + VIEWPORTX*2
+ BUTTONCX + BUTTONCX
@ -1907,7 +1905,7 @@ void GetWidthHeight(int& nWidth, int& nHeight)
+ MAGICY; + MAGICY;
} }
void FrameResizeWindow(void) static void FrameResizeWindow(int nOldWidth, int nOldHeight)
{ {
int nWidth, nHeight; int nWidth, nHeight;
GetWidthHeight(nWidth, nHeight); GetWidthHeight(nWidth, nHeight);
@ -1918,17 +1916,23 @@ void FrameResizeWindow(void)
// //
buttonx = (g_nViewportCX + VIEWPORTX*2); buttonx = g_nViewportCX + VIEWPORTX*2;
buttony = 0; buttony = 0;
RECT irect; // Invalidate old rect region
irect.left = irect.top = 0; {
irect.right = nWidth; RECT irect;
irect.bottom = nHeight; irect.left = irect.top = 0;
InvalidateRect(g_hFrameWindow, &irect, true); irect.right = nOldWidth;
MoveWindow(g_hFrameWindow, nXPos, nYPos, nWidth, nHeight, false); irect.bottom = nOldHeight;
InvalidateRect(g_hFrameWindow, &irect, TRUE);
}
// Resize the window
MoveWindow(g_hFrameWindow, nXPos, nYPos, nWidth, nHeight, FALSE);
UpdateWindow(g_hFrameWindow); UpdateWindow(g_hFrameWindow);
// Remove the tooltips for the old window size
TOOLINFO toolinfo = {0}; TOOLINFO toolinfo = {0};
toolinfo.cbSize = sizeof(toolinfo); toolinfo.cbSize = sizeof(toolinfo);
toolinfo.hwnd = g_hFrameWindow; toolinfo.hwnd = g_hFrameWindow;
@ -1937,9 +1941,16 @@ void FrameResizeWindow(void)
toolinfo.uId = 1; toolinfo.uId = 1;
SendMessage(tooltipwindow, TTM_DELTOOL, 0, (LPARAM)&toolinfo); SendMessage(tooltipwindow, TTM_DELTOOL, 0, (LPARAM)&toolinfo);
// Setup the tooltips for the new window size
SetupTooltipControls(); SetupTooltipControls();
} }
//
// ----- ALL GLOBALLY ACCESSIBLE FUNCTIONS ARE BELOW THIS LINE -----
//
//===========================================================================
void FrameCreateWindow(void) void FrameCreateWindow(void)
{ {
int nWidth, nHeight; int nWidth, nHeight;