Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-20 23:01:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix browser window buttons and Web page favicon display

Browse source
This commit is contained in:
David Rowe 2020-09-06 20:40:07 +12:00
parent 7a686d95e0
commit fd2535ecaf
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
interface/resources/qml/Browser.qml
View file

@ -63,29 +63,38 @@ ScrollingWindow {
anchors.leftMargin: 8 anchors.leftMargin: 8
HiFiGlyphs { HiFiGlyphs {
id: back; id: back;
enabled: webview.canGoBack; enabled: webview.canGoBack
text: hifi.glyphs.backward text: hifi.glyphs.backward
color: enabled ? hifi.colors.text : hifi.colors.disabledText color: enabled ? hifi.colors.faintGray : hifi.colors.lightGray
size: 48 size: 48
MouseArea { anchors.fill: parent; onClicked: webview.goBack() } MouseArea {
anchors.fill: parent
onClicked: webview.goBack();
}
} }
HiFiGlyphs { HiFiGlyphs {
id: forward; id: forward;
enabled: webview.canGoForward; enabled: webview.canGoForward
text: hifi.glyphs.forward text: hifi.glyphs.forward
color: enabled ? hifi.colors.text : hifi.colors.disabledText color: enabled ? hifi.colors.faintGray : hifi.colors.lightGray
size: 48 size: 48
MouseArea { anchors.fill: parent; onClicked: webview.goForward() } MouseArea {
anchors.fill: parent
onClicked: webview.goForward();
}
} }
HiFiGlyphs { HiFiGlyphs {
id: reload; id: reload;
enabled: webview.canGoForward; enabled: url !== ""
text: webview.loading ? hifi.glyphs.close : hifi.glyphs.reload text: webview.loading ? hifi.glyphs.close : hifi.glyphs.reload
color: enabled ? hifi.colors.text : hifi.colors.disabledText color: enabled ? hifi.colors.faintGray : hifi.colors.lightGray
size: 48 size: 48
MouseArea { anchors.fill: parent; onClicked: webview.goForward() } MouseArea {
anchors.fill: parent
onClicked: webview.loading ? webview.stop() : webview.reload();
}
} }
} }
@ -105,11 +114,12 @@ ScrollingWindow {
width: parent.height width: parent.height
height: parent.height height: parent.height
Image { Image {
source: webview.icon; source: webview.icon
x: (parent.height - height) / 2 x: (parent.height - height) / 2
y: (parent.width - width) / 2 y: (parent.width - width) / 2
sourceSize: Qt.size(width, height); width: 28
verticalAlignment: Image.AlignVCenter; height: 28
verticalAlignment: Image.AlignVCenter
horizontalAlignment: Image.AlignHCenter horizontalAlignment: Image.AlignHCenter
} }
} }