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

Clean up code related to making window focus on run

This commit is contained in:
zilmar 2012-11-29 08:22:06 +11:00
parent 601c94f49d
commit 50ba484893
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64/N64 System/N64 Class.cpp
View File

@ -809,6 +809,8 @@ void CN64System::ExecuteSyncCPU ()
m_SyncCPU = new CN64System(&SyncPlugins, true); m_SyncCPU = new CN64System(&SyncPlugins, true);
m_Recomp = new CRecompiler(m_Profile,m_EndEmulation); m_Recomp = new CRecompiler(m_Profile,m_EndEmulation);
g_Notify->BringToTop();
SetActiveSystem(); SetActiveSystem();
if (m_SyncCPU->SetActiveSystem()) if (m_SyncCPU->SetActiveSystem())
{ {

11
Source/Project64/User Interface/Gui Class.cpp
View File

@ -391,8 +391,8 @@ void CMainGui::SetWindowMenu (CBaseMenu * Menu) {
} }
} }
void CMainGui::RefreshMenu (void) { void CMainGui::RefreshMenu (void)
CGuard Guard(m_CS); {
if (!m_Menu) { return; } if (!m_Menu) { return; }
m_Menu->ResetMenu(); m_Menu->ResetMenu();
} }
@ -712,7 +712,12 @@ DWORD CALLBACK CMainGui::MainGui_Proc (WND_HANDLE hWnd, DWORD uMsg, DWORD wParam
while (ShowCursor(TRUE) < 0) { Sleep(0); } while (ShowCursor(TRUE) < 0) { Sleep(0); }
} }
break; break;
case WM_MAKE_FOCUS: SetFocus((HWND)hWnd); break; case WM_MAKE_FOCUS:
{
CMainGui * _this = (CMainGui *)GetProp((HWND)hWnd,"Class");
_this->BringToTop();
}
break;
case WM_BORWSER_TOP: case WM_BORWSER_TOP:
{ {
CMainGui * _this = (CMainGui *)GetProp((HWND)hWnd,"Class"); CMainGui * _this = (CMainGui *)GetProp((HWND)hWnd,"Class");

14
Source/Project64/User Interface/Gui Class.h
View File

@ -6,6 +6,13 @@ class CN64System;
class CNotification; class CNotification;
class CriticalSection; class CriticalSection;
enum {
WM_HIDE_CUROSR = WM_USER + 10,
WM_MAKE_FOCUS = WM_USER + 17,
WM_INIATE_PLUGIN = WM_USER + 18,
WM_BORWSER_TOP = WM_USER + 40,
};
class CMainGui : class CMainGui :
public CRomBrowser, public CRomBrowser,
private CGuiSettings private CGuiSettings
@ -18,13 +25,6 @@ class CMainGui :
enum { StatusBarID = 400 }; enum { StatusBarID = 400 };
enum {
WM_HIDE_CUROSR = WM_USER + 10,
WM_MAKE_FOCUS = WM_USER + 17,
WM_INIATE_PLUGIN = WM_USER + 18,
WM_BORWSER_TOP = WM_USER + 40,
};
WND_HANDLE m_hMainWindow, m_hStatusWnd; WND_HANDLE m_hMainWindow, m_hStatusWnd;
bool m_hacked; bool m_hacked;
const bool m_bMainWindow; const bool m_bMainWindow;

3
Source/Project64/User Interface/Rom Browser Class.cpp
View File

@ -1640,8 +1640,7 @@ void CRomBrowser::HideRomList (void) {
//Make the main window visible again //Make the main window visible again
ShowWindow((HWND)m_MainWindow,SW_SHOW); ShowWindow((HWND)m_MainWindow,SW_SHOW);
BringWindowToTop((HWND)m_MainWindow); BringWindowToTop((HWND)m_MainWindow);
PostMessage((HWND)m_MainWindow, WM_USER + 17, 0,0 ); PostMessage((HWND)m_MainWindow, WM_MAKE_FOCUS, 0,0 );
} }
bool CRomBrowser::RomDirNeedsRefresh ( void ) bool CRomBrowser::RomDirNeedsRefresh ( void )