From bdff71151dab4b3c7f74ab13c832f0b4062603ad Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 7 Oct 2016 13:35:44 +1300 Subject: [PATCH] Updates from code review --- interface/resources/qml/ToolWindow.qml | 10 +++++----- .../resources/qml/controls-uit/ContentSection.qml | 2 +- libraries/gl/src/gl/OffscreenQmlSurface.cpp | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/interface/resources/qml/ToolWindow.qml b/interface/resources/qml/ToolWindow.qml index a3a04be13e..68c8099970 100644 --- a/interface/resources/qml/ToolWindow.qml +++ b/interface/resources/qml/ToolWindow.qml @@ -56,7 +56,7 @@ ScrollingWindow { anchors.top: parent.top TabView { - id: tabView; + id: tabView width: pane.contentWidth // Pane height so that don't use Window's scrollbars otherwise tabs may be scrolled out of view. height: pane.scrollHeight @@ -69,10 +69,10 @@ ScrollingWindow { // (required for letting the C++ code access the webview) active: true enabled: false - property string originalUrl: ""; + property string originalUrl: "" WebView { - id: webView; + id: webView anchors.fill: parent enabled: false property alias eventBridgeWrapper: eventBridgeWrapper @@ -80,11 +80,11 @@ ScrollingWindow { QtObject { id: eventBridgeWrapper WebChannel.id: "eventBridgeWrapper" - property var eventBridge; + property var eventBridge } webChannel.registeredObjects: [eventBridgeWrapper] - onEnabledChanged: toolWindow.updateVisiblity(); + onEnabledChanged: toolWindow.updateVisiblity() } } } diff --git a/interface/resources/qml/controls-uit/ContentSection.qml b/interface/resources/qml/controls-uit/ContentSection.qml index 5fc86fc565..47a13e9262 100644 --- a/interface/resources/qml/controls-uit/ContentSection.qml +++ b/interface/resources/qml/controls-uit/ContentSection.qml @@ -109,7 +109,7 @@ Column { } MouseArea { - // Events are propogated so that any active control is defocussed. + // Events are propogated so that any active control is defocused. anchors.fill: parent propagateComposedEvents: true onPressed: { diff --git a/libraries/gl/src/gl/OffscreenQmlSurface.cpp b/libraries/gl/src/gl/OffscreenQmlSurface.cpp index b299421a1b..5b267ab7d5 100644 --- a/libraries/gl/src/gl/OffscreenQmlSurface.cpp +++ b/libraries/gl/src/gl/OffscreenQmlSurface.cpp @@ -581,7 +581,6 @@ bool OffscreenQmlRenderThread::allowNewFrame(uint8_t fps) { } OffscreenQmlSurface::OffscreenQmlSurface() { - // moveToThread(qApp->thread()); } static const uint64_t MAX_SHUTDOWN_WAIT_SECS = 2;