ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #645: Fix webview clipping on OSX

Browse Source
This commit is contained in:
Jenkins nymea 2021-08-18 15:12:19 +02:00
commit 47a26e6f41
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nymea-app/ui/mainviews/dashboard/Dashboard.qml
View File

@ -129,13 +129,11 @@ Item {
target: loader.item target: loader.item
property: "bottomClip" property: "bottomClip"
value: loader.bottomClip value: loader.bottomClip
when: ["android", "ios"].indexOf(Qt.platform.os) >= 0
} }
Binding { Binding {
target: loader.item target: loader.item
property: "topClip" property: "topClip"
value: loader.topClip value: loader.topClip
when: ["android", "ios"].indexOf(Qt.platform.os) >= 0
} }
Connections { Connections {
target: loader.item target: loader.item

12
nymea-app/ui/mainviews/dashboard/DashboardWebViewDelegate.qml
View File

@ -64,10 +64,16 @@ DashboardDelegateBase {
} }
} }
property bool needsHack: ["android", "ios"].indexOf(Qt.platform.os) >= 0 // Some platforms cannot embed webviews inside an app. In those cases, a platform native
// Browser will be overlaid on top of the app. As we can't draw on top of that, we'll need to be
// clever in resizing and hding...
property bool needsHack: ["android", "ios", "osx"].indexOf(Qt.platform.os) >= 0
property bool webViewVisible: !needsHack || property bool webViewVisible: !needsHack ||
(!app.mainMenu.visible && !root.editMode && root.topClip < root.height && root.bottomClip < height && !pageStack.busy) (!app.mainMenu.visible && !root.editMode && root.topClip < root.height && root.bottomClip < height && !pageStack.busy)
property int topClip: needsHack ? root.topClip : 0
property int bottomClip: needsHack ? root.bottomClip : 0
property string webViewString: property string webViewString:
' '
import QtQuick 2.8; import QtQuick 2.8;
@ -77,8 +83,8 @@ DashboardDelegateBase {
WebView { WebView {
id: webView id: webView
anchors.fill: parent anchors.fill: parent
anchors.bottomMargin: root.bottomClip + Style.smallMargins anchors.bottomMargin: delegateRoot.bottomClip + Style.smallMargins
anchors.topMargin: root.topClip + Style.smallMargins anchors.topMargin: delegateRoot.topClip + Style.smallMargins
url: root.item.url url: root.item.url
enabled: root.item.interactive enabled: root.item.interactive
visible: delegateRoot.webViewVisible visible: delegateRoot.webViewVisible