Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-27 23:11:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updates from code review

Browse source
This commit is contained in:
David Rowe 2016-10-07 13:35:44 +13:00
parent e2e762f9e7
commit bdff71151d
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/resources/qml/ToolWindow.qml
View file

@ -56,7 +56,7 @@ ScrollingWindow {
anchors.top: parent.top anchors.top: parent.top
TabView { TabView {
id: tabView; id: tabView
width: pane.contentWidth width: pane.contentWidth
// Pane height so that don't use Window's scrollbars otherwise tabs may be scrolled out of view. // Pane height so that don't use Window's scrollbars otherwise tabs may be scrolled out of view.
height: pane.scrollHeight height: pane.scrollHeight
@ -69,10 +69,10 @@ ScrollingWindow {
// (required for letting the C++ code access the webview) // (required for letting the C++ code access the webview)
active: true active: true
enabled: false enabled: false
property string originalUrl: ""; property string originalUrl: ""
WebView { WebView {
id: webView; id: webView
anchors.fill: parent anchors.fill: parent
enabled: false enabled: false
property alias eventBridgeWrapper: eventBridgeWrapper property alias eventBridgeWrapper: eventBridgeWrapper
@ -80,11 +80,11 @@ ScrollingWindow {
QtObject { QtObject {
id: eventBridgeWrapper id: eventBridgeWrapper
WebChannel.id: "eventBridgeWrapper" WebChannel.id: "eventBridgeWrapper"
property var eventBridge; property var eventBridge
} }
webChannel.registeredObjects: [eventBridgeWrapper] webChannel.registeredObjects: [eventBridgeWrapper]
onEnabledChanged: toolWindow.updateVisiblity(); onEnabledChanged: toolWindow.updateVisiblity()
} }
} }
} }

2
interface/resources/qml/controls-uit/ContentSection.qml
View file

@ -109,7 +109,7 @@ Column {
} }
MouseArea { MouseArea {
// Events are propogated so that any active control is defocussed. // Events are propogated so that any active control is defocused.
anchors.fill: parent anchors.fill: parent
propagateComposedEvents: true propagateComposedEvents: true
onPressed: { onPressed: {

1
libraries/gl/src/gl/OffscreenQmlSurface.cpp
View file

@ -581,7 +581,6 @@ bool OffscreenQmlRenderThread::allowNewFrame(uint8_t fps) {
} }
OffscreenQmlSurface::OffscreenQmlSurface() { OffscreenQmlSurface::OffscreenQmlSurface() {
// moveToThread(qApp->thread());
} }
static const uint64_t MAX_SHUTDOWN_WAIT_SECS = 2; static const uint64_t MAX_SHUTDOWN_WAIT_SECS = 2;