piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "support retina display"

Browse Source 
This reverts commit 3aa9901618.
This commit is contained in:
Matthew Parlane
2012-12-24 08:01:44 +13:00
parent 59ec1fe180
commit eedca57270
7 changed files with 40 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -450,26 +450,11 @@ CFrame::~CFrame()
bool CFrame::RendererIsFullscreen()
{
bool fullscreen = false;
if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE)
{
fullscreen = m_RenderFrame->IsFullScreen();
return m_RenderFrame->IsFullScreen();
}
#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
if (m_RenderFrame != NULL)
{
NSView *view = (NSView *) m_RenderFrame->GetHandle();
NSWindow *window = [view window];
if ([window respondsToSelector:@selector(toggleFullScreen:)]) {
fullscreen = (([window styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask);
}
}
#endif
return fullscreen;
return false;
}
void CFrame::OnQuit(wxCommandEvent& WXUNUSED (event))
@ -1017,23 +1002,7 @@ void CFrame::DoFullscreen(bool bF)
{
ToggleDisplayMode(bF);
#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
NSView *view = (NSView *) m_RenderFrame->GetHandle();
NSWindow *window = [view window];
if ([window respondsToSelector:@selector(toggleFullScreen:)])
{
if (bF != RendererIsFullscreen())
{
[window toggleFullScreen:nil];
}
}
else
#endif
{
m_RenderFrame->ShowFullScreen(bF, wxFULLSCREEN_ALL);
}
m_RenderFrame->ShowFullScreen(bF, wxFULLSCREEN_ALL);
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
{
if (bF)