mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-16 18:40:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Feature/globals handling (#1352)

Browse Source 
* Cleaner handling of global state
* Prevent Lua memory corruption (closes #982)
* Initialize glfw first thing to prevent weird joystick loading bug during startup
This commit is contained in:
Alexander Bock
2020-10-21 22:30:05 +02:00
committed by GitHub
parent 1525a0490d
commit efffc25ce0
164 changed files with 1484 additions and 1390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/webbrowser/src/browserinstance.cpp
View File

@@ -75,8 +75,8 @@ BrowserInstance::~BrowserInstance() {
void BrowserInstance::initialize() {
reshape(static_cast<glm::ivec2>(
static_cast<glm::vec2>(global::windowDelegate.currentSubwindowSize()) *
global::windowDelegate.dpiScaling()
static_cast<glm::vec2>(global::windowDelegate->currentSubwindowSize()) *
global::windowDelegate->dpiScaling()
));
_isInitialized = true;
_shouldReshape = true;
@@ -170,7 +170,7 @@ bool BrowserInstance::sendMouseWheelEvent(const CefMouseEvent& event,
}
void BrowserInstance::setZoom(float ratio) {
const float dpiScaling = global::windowDelegate.dpiScaling().x;
const float dpiScaling = global::windowDelegate->dpiScaling().x;
// Zooming in CEF is non-linear according to this:
// https://www.magpcss.org/ceforum/viewtopic.php?f=6&t=11491