Skip to content
Snippets Groups Projects
Commit f2ebdcbb authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix hidpi checkbox in graphics prefs being non-functional

parent 86d19ae4
No related branches found
No related tags found
No related merge requests found
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#import "llwindowmacosx-objc.h" #import "llwindowmacosx-objc.h"
#import "llappdelegate-objc.h" #import "llappdelegate-objc.h"
extern BOOL gHiDPISupport;
#pragma mark local functions #pragma mark local functions
NativeKeyEventData extractKeyDataFromKeyEvent(NSEvent* theEvent) NativeKeyEventData extractKeyDataFromKeyEvent(NSEvent* theEvent)
...@@ -247,7 +249,8 @@ attributedStringInfo getSegments(NSAttributedString *str) ...@@ -247,7 +249,8 @@ attributedStringInfo getSegments(NSAttributedString *str)
} }
//for retina support //for retina support
//[self setWantsBestResolutionOpenGLSurface:YES]; BOOL requestHiDPI = gHiDPISupport ? YES : NO;
[self setWantsBestResolutionOpenGLSurface:requestHiDPI];
[self setPixelFormat:pixelFormat]; [self setPixelFormat:pixelFormat];
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include <CoreGraphics/CGDisplayConfiguration.h> #include <CoreGraphics/CGDisplayConfiguration.h>
extern BOOL gDebugWindowProc; extern BOOL gDebugWindowProc;
BOOL gHiDPISupport = TRUE;
const S32 BITS_PER_PIXEL = 32; const S32 BITS_PER_PIXEL = 32;
const S32 MAX_NUM_RESOLUTIONS = 32; const S32 MAX_NUM_RESOLUTIONS = 32;
......
...@@ -290,6 +290,10 @@ extern BOOL gRandomizeFramerate; ...@@ -290,6 +290,10 @@ extern BOOL gRandomizeFramerate;
extern BOOL gPeriodicSlowFrame; extern BOOL gPeriodicSlowFrame;
extern BOOL gDebugGL; extern BOOL gDebugGL;
#if LL_DARWIN
extern BOOL gHiDPISupport;
#endif
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// All from the last globals push... // All from the last globals push...
...@@ -604,6 +608,10 @@ static void settings_to_globals() ...@@ -604,6 +608,10 @@ static void settings_to_globals()
gDebugWindowProc = gSavedSettings.getBOOL("DebugWindowProc"); gDebugWindowProc = gSavedSettings.getBOOL("DebugWindowProc");
gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates"); gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates");
LLWorldMapView::sMapScale = gSavedSettings.getF32("MapScale"); LLWorldMapView::sMapScale = gSavedSettings.getF32("MapScale");
#if LL_DARWIN
gHiDPISupport = gSavedSettings.getBOOL("RenderHiDPI");
#endif
} }
static void settings_modify() static void settings_modify()
...@@ -3204,7 +3212,7 @@ LLSD LLAppViewer::getViewerInfo() const ...@@ -3204,7 +3212,7 @@ LLSD LLAppViewer::getViewerInfo() const
info["TEXTURE_MEMORY"] = gSavedSettings.getS32("TextureMemory"); info["TEXTURE_MEMORY"] = gSavedSettings.getS32("TextureMemory");
#if LL_DARWIN #if LL_DARWIN
info["HIDPI"] = TRUE; info["HIDPI"] = gHiDPISupport;
#endif #endif
// Libraries // Libraries
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment