diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-11 05:48:22 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-11 05:48:22 +0000 |
| commit | 9c09500a13e0ef2fcc2d7c9fc0468f1e2f76b73f (patch) | |
| tree | a931dec39ad9d84a3d5c781f7a8c139547cb4915 /Source | |
| parent | bb725858eaead1ffab722e431a9a8c1be7276858 (diff) | |
For some reason the wxGLCanvas loses keyboard focus whenever the
full-screen mode is toggled, so we just re-set it afterwards.
Didn't mean to include the version string in the status bar updates.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6814 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/Src/Core.cpp | 8 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 1 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index 09e0c76dc0..22cf00ace2 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -671,8 +671,10 @@ void VideoThrottle() #endif // This is our final "frame counter" string - std::string SMessage = StringFromFormat("%s | %s | %s", - svn_rev_str, SSettings.c_str(), SFPS.c_str()); + std::string SMessage = StringFromFormat("%s | %s", + SSettings.c_str(), SFPS.c_str()); + std::string TMessage = StringFromFormat("%s | ", svn_rev_str) + + SMessage; // Show message if (g_pUpdateFPSDisplay != NULL) @@ -683,7 +685,7 @@ void VideoThrottle() Host_UpdateStatusBar(SMessage.c_str()); Host_UpdateTitle(svn_rev_str); } else - Host_UpdateTitle(SMessage.c_str()); + Host_UpdateTitle(TMessage.c_str()); // Reset counter diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp index cc2a4b92a6..afde606fc9 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp @@ -519,6 +519,7 @@ void OpenGL_Update() if (width == s_backbuffer_width && height == s_backbuffer_height) return; + GLWin.glCanvas->SetFocus(); GLWin.glCanvas->SetSize(0, 0, width, height); GLWin.glCtxt->SetCurrent(*GLWin.glCanvas); s_backbuffer_width = width; diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp index 6395505633..7b49480400 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp @@ -316,6 +316,7 @@ void OpenGL_Update() if (width == s_backbuffer_width && height == s_backbuffer_height) return; + GLWin.glCanvas->SetFocus(); GLWin.glCanvas->SetSize(0, 0, width, height); GLWin.glCtxt->SetCurrent(*GLWin.glCanvas); s_backbuffer_width = width; |