mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Misc coding style cleanups

Browse Source
This commit is contained in:
Alexander Bock
2018-11-06 12:02:56 -05:00
parent d1fa145e0a
commit 7a3a8a5cf6
33 changed files with 399 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/cefwebgui/cefwebguimodule.cpp
View File

@@ -38,7 +38,7 @@
namespace {
constexpr const char* _loggerCat = "CefWebGui";
constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
"Enabled",
"Is Enabled",
@@ -70,11 +70,10 @@ CefWebGuiModule::CefWebGuiModule()
addProperty(_cefWebGuiVisible);
addProperty(_guiUrl);
}
void CefWebGuiModule::startOrStopGui() {
WebBrowserModule* webBrowserModule =
global::moduleEngine.module<WebBrowserModule>();
WebBrowserModule* webBrowserModule = global::moduleEngine.module<WebBrowserModule>();
const bool isGuiWindow =
global::windowDelegate.hasGuiWindow() ?
global::windowDelegate.isGuiWindow() :
@@ -83,7 +82,7 @@ void CefWebGuiModule::startOrStopGui() {
if (_cefWebGuiEnabled && isGuiWindow && isMaster) {
LDEBUGC("WebBrowser", fmt::format("Loading GUI from {}", _guiUrl));
if (!_guiInstance) {
_guiInstance = std::make_shared<BrowserInstance>(
new GUIRenderHandler,
@@ -100,7 +99,7 @@ void CefWebGuiModule::startOrStopGui() {
_guiInstance.reset();
}
}
void CefWebGuiModule::updateUrl() {
if (_guiInstance) {
_guiInstance->loadUrl(_guiUrl);