Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
XDG Integration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
JennaHuntsman
XDG Integration
Commits
f2ebdcbb
Commit
f2ebdcbb
authored
3 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Fix hidpi checkbox in graphics prefs being non-functional
parent
86d19ae4
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
indra/llwindow/llopenglview-objc.mm
+4
-1
4 additions, 1 deletion
indra/llwindow/llopenglview-objc.mm
indra/llwindow/llwindowmacosx.cpp
+1
-0
1 addition, 0 deletions
indra/llwindow/llwindowmacosx.cpp
indra/newview/llappviewer.cpp
+9
-1
9 additions, 1 deletion
indra/newview/llappviewer.cpp
with
14 additions
and
2 deletions
indra/llwindow/llopenglview-objc.mm
+
4
−
1
View file @
f2ebdcbb
...
@@ -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
];
...
...
This diff is collapsed.
Click to expand it.
indra/llwindow/llwindowmacosx.cpp
+
1
−
0
View file @
f2ebdcbb
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llappviewer.cpp
+
9
−
1
View file @
f2ebdcbb
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment