History

Merge pull request #4850 from jherico/web-entity

Web entity

Brad Hefta-Gaub committed 11 years ago

Commit 3b7acae2 parents 0a65c06 3b7e8a622 files · +1016 −451Browse files

Showing the changes to interface/src/Application.cpp (1 of 22 files). Show all

Unified · Split

interface/src/Application.cpp+6−0
@@ -341,6 +341,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 340 unmodified lines
341341 _domainConnectionRefusals(QList<QString>()),
342342 _maxOctreePPS(maxOctreePacketsPerSecond.get())
343343 {
344+ setInstance(this);
344345 #ifdef Q_OS_WIN
345346 installNativeEventFilter(&MyNativeEventFilter::getInstance());
346347 #endif
@@ -4692,3 +4693,8 @@ void Application::setMaxOctreePacketsPerSecond(int maxOctreePPS) { · 4345 unmodified lines
46924693 int Application::getMaxOctreePacketsPerSecond() {
46934694 return _maxOctreePPS;
46944695 }
4696+
4697+qreal Application::getDevicePixelRatio() {
4698+ return _window ? _window->windowHandle()->devicePixelRatio() : 1.0;
4699+}
4700+

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t