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

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
This commit is contained in:
Soren Jorvang 2011-01-11 05:48:22 +00:00
parent bb725858ea
commit 9c09500a13
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/Src/Core.cpp
View File

@ -671,8 +671,10 @@ void VideoThrottle()
#endif #endif
// This is our final "frame counter" string // This is our final "frame counter" string
std::string SMessage = StringFromFormat("%s | %s | %s", std::string SMessage = StringFromFormat("%s | %s",
svn_rev_str, SSettings.c_str(), SFPS.c_str()); SSettings.c_str(), SFPS.c_str());
std::string TMessage = StringFromFormat("%s | ", svn_rev_str) +
SMessage;
// Show message // Show message
if (g_pUpdateFPSDisplay != NULL) if (g_pUpdateFPSDisplay != NULL)
@ -683,7 +685,7 @@ void VideoThrottle()
Host_UpdateStatusBar(SMessage.c_str()); Host_UpdateStatusBar(SMessage.c_str());
Host_UpdateTitle(svn_rev_str); Host_UpdateTitle(svn_rev_str);
} else } else
Host_UpdateTitle(SMessage.c_str()); Host_UpdateTitle(TMessage.c_str());
// Reset counter // Reset counter

1
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

@ -519,6 +519,7 @@ void OpenGL_Update()
if (width == s_backbuffer_width && height == s_backbuffer_height) if (width == s_backbuffer_width && height == s_backbuffer_height)
return; return;
GLWin.glCanvas->SetFocus();
GLWin.glCanvas->SetSize(0, 0, width, height); GLWin.glCanvas->SetSize(0, 0, width, height);
GLWin.glCtxt->SetCurrent(*GLWin.glCanvas); GLWin.glCtxt->SetCurrent(*GLWin.glCanvas);
s_backbuffer_width = width; s_backbuffer_width = width;

1
Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp
View File

@ -316,6 +316,7 @@ void OpenGL_Update()
if (width == s_backbuffer_width && height == s_backbuffer_height) if (width == s_backbuffer_width && height == s_backbuffer_height)
return; return;
GLWin.glCanvas->SetFocus();
GLWin.glCanvas->SetSize(0, 0, width, height); GLWin.glCanvas->SetSize(0, 0, width, height);
GLWin.glCtxt->SetCurrent(*GLWin.glCanvas); GLWin.glCtxt->SetCurrent(*GLWin.glCanvas);
s_backbuffer_width = width; s_backbuffer_width = width;