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

Fix the nogui build. Don't show the Xrandr logs in release builds. Fix flickering in fullscreen when using the auto window size option and not rendering to main. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6914 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2011-01-25 12:52:20 +00:00
parent d2044a7a23
commit 81aebe5e96
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -682,7 +682,7 @@ void CFrame::GetRenderWindowSize(int& x, int& y, int& width, int& height)
void CFrame::OnRenderWindowSizeRequest(int width, int height) void CFrame::OnRenderWindowSizeRequest(int width, int height)
{ {
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize || if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize ||
IsFullScreen() || m_RenderFrame->IsMaximized()) RendererIsFullscreen() || m_RenderFrame->IsMaximized())
return; return;
int old_width, old_height; int old_width, old_height;

2
Source/Core/DolphinWX/Src/MainNoGUI.cpp
View File

@ -88,7 +88,7 @@ void Host_GetRenderWindowSize(int& x, int& y, int& width, int& height)
height = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight; height = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight;
} }
void Host_RequestRenderWindowSize(int& width, int& height) {} void Host_RequestRenderWindowSize(int width, int height) {}
bool Host_RendererHasFocus() bool Host_RendererHasFocus()
{ {

12
Source/Core/DolphinWX/Src/X11Utils.cpp
View File

@ -168,14 +168,14 @@ XRRConfiguration::XRRConfiguration(Display *_dpy, Window _win)
sizes = XRRSizes(dpy, DefaultScreen(dpy), &numSizes); sizes = XRRSizes(dpy, DefaultScreen(dpy), &numSizes);
if (!numSizes) if (!numSizes)
{ {
NOTICE_LOG(VIDEO, "XRRExtension not supported."); WARN_LOG(VIDEO, "XRRExtension not supported.");
bValid = false; bValid = false;
return; return;
} }
int vidModeMajorVersion, vidModeMinorVersion; int vidModeMajorVersion, vidModeMinorVersion;
XRRQueryVersion(dpy, &vidModeMajorVersion, &vidModeMinorVersion); XRRQueryVersion(dpy, &vidModeMajorVersion, &vidModeMinorVersion);
NOTICE_LOG(VIDEO, "XRRExtension-Version %d.%d", vidModeMajorVersion, vidModeMinorVersion); INFO_LOG(VIDEO, "XRRExtension-Version %d.%d", vidModeMajorVersion, vidModeMinorVersion);
Update(); Update();
} }
@ -203,12 +203,12 @@ void XRRConfiguration::Update()
screenConfig = XRRGetScreenInfo(dpy, win); screenConfig = XRRGetScreenInfo(dpy, win);
/* save desktop resolution */ // Save desktop resolution
deskSize = XRRConfigCurrentConfiguration(screenConfig, &screenRotation); deskSize = XRRConfigCurrentConfiguration(screenConfig, &screenRotation);
/* Set the desktop resolution as the default */ // Set the desktop resolution as the default
fullSize = deskSize; fullSize = deskSize;
/* Find the index of the fullscreen resolution from config */ // Find the index of the fullscreen resolution from config
sizes = XRRConfigSizes(screenConfig, &numSizes); sizes = XRRConfigSizes(screenConfig, &numSizes);
if (numSizes > 0 && sizes != NULL) { if (numSizes > 0 && sizes != NULL) {
for (int i = 0; i < numSizes; i++) { for (int i = 0; i < numSizes; i++) {
@ -216,7 +216,7 @@ void XRRConfiguration::Update()
fullSize = i; fullSize = i;
} }
} }
NOTICE_LOG(VIDEO, "Fullscreen Resolution %dx%d", INFO_LOG(VIDEO, "Fullscreen Resolution %dx%d",
sizes[fullSize].width, sizes[fullSize].height); sizes[fullSize].width, sizes[fullSize].height);
} }
else { else {