ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Win32 - Menu height taken into account when sizing client area.

This commit is contained in:
adelikat 2008-12-27 03:11:40 +00:00
parent 996ddcfefb
commit 09566a1ba1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/drivers/win/window.cpp
View File

@ -114,7 +114,7 @@ static LONG WindowXC=1<<30,WindowYC;
int MainWindow_wndx, MainWindow_wndy; int MainWindow_wndx, MainWindow_wndy;
static uint32 mousex,mousey,mouseb; static uint32 mousex,mousey,mouseb;
static int vchanged = 0; static int vchanged = 0;
int menuYoffset = 0;
//Function Declarations //Function Declarations
void ChangeMenuItemText(int menuitem, string text); //Alters a menu item name void ChangeMenuItemText(int menuitem, string text); //Alters a menu item name
void ChangeContextMenuItemText(int menuitem, string text, HMENU menu); //Alters a context menu item name void ChangeContextMenuItemText(int menuitem, string text, HMENU menu); //Alters a context menu item name
@ -252,7 +252,7 @@ void CalcWindowSize(RECT *al)
al->left = 0; al->left = 0;
al->right = VNSWID * winsizemulx; al->right = VNSWID * winsizemulx;
al->top = 0; al->top = 0;
al->bottom = FSettings.TotalScanlines() * winsizemuly; al->bottom = (FSettings.TotalScanlines() * winsizemuly) + menuYoffset;
AdjustWindowRectEx(al, AdjustWindowRectEx(al,
GetWindowLong(hAppWnd, GWL_STYLE), GetWindowLong(hAppWnd, GWL_STYLE),
@ -764,6 +764,10 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
{ {
int whichContext = 0; int whichContext = 0;
POINT pt; POINT pt;
RECT file_rect;
RECT help_rect;
RECT clientrect;
int x = 0;
switch(msg) switch(msg)
{ {
@ -887,6 +891,10 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
winheight=srect.bottom; winheight=srect.bottom;
wrect->right = wrect->left + srect.right; wrect->right = wrect->left + srect.right;
wrect->bottom = wrect->top + srect.bottom; wrect->bottom = wrect->top + srect.bottom;
GetMenuItemRect(hWnd, fceumenu, 0, &file_rect);
GetMenuItemRect(hWnd, fceumenu, 5, &help_rect);
menuYoffset = help_rect.top-file_rect.top;
} }
//sizchange=1; //sizchange=1;
//break; //break;