Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 17:41:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10368 from zfox23/palWebViewtoTabletWebView

Browse source 
PAL WebView is now a TabletWebView
This commit is contained in:
Zach Fox 2017-05-03 16:51:32 -07:00 committed by GitHub
commit d28d89e8ff
1 changed files with 10 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

142
interface/resources/qml/hifi/Pal.qml
View file

@ -44,6 +44,7 @@ Rectangle {
property var activeTab: "nearbyTab"; property var activeTab: "nearbyTab";
property bool currentlyEditingDisplayName: false property bool currentlyEditingDisplayName: false
property bool punctuationMode: false; property bool punctuationMode: false;
property var eventBridge;
HifiConstants { id: hifi; } HifiConstants { id: hifi; }
@ -1036,139 +1037,16 @@ Rectangle {
} }
} // Keyboard } // Keyboard
Item { HifiControls.TabletWebView {
id: webViewContainer; eventBridge: pal.eventBridge;
anchors.fill: parent; id: userInfoViewer;
anchors {
Rectangle { top: parent.top;
id: navigationContainer; bottom: parent.bottom;
visible: userInfoViewer.visible; left: parent.left;
height: 60; right: parent.right;
anchors {
top: parent.top;
left: parent.left;
right: parent.right;
}
color: hifi.colors.faintGray;
Item {
id: backButton
anchors {
top: parent.top;
left: parent.left;
}
height: parent.height - addressBar.height;
width: parent.width/2;
FiraSansSemiBold {
// Properties
text: "BACK";
elide: Text.ElideRight;
// Anchors
anchors.fill: parent;
// Text Size
size: 16;
// Text Positioning
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter;
// Style
color: backButtonMouseArea.containsMouse || !userInfoViewer.canGoBack ? hifi.colors.lightGray : hifi.colors.darkGray;
MouseArea {
id: backButtonMouseArea;
anchors.fill: parent
hoverEnabled: enabled
onClicked: {
if (userInfoViewer.canGoBack) {
userInfoViewer.goBack();
}
}
}
}
}
Item {
id: closeButtonContainer
anchors {
top: parent.top;
right: parent.right;
}
height: parent.height - addressBar.height;
width: parent.width/2;
FiraSansSemiBold {
id: closeButton;
// Properties
text: "CLOSE";
elide: Text.ElideRight;
// Anchors
anchors.fill: parent;
// Text Size
size: 16;
// Text Positioning
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter;
// Style
color: hifi.colors.redHighlight;
MouseArea {
anchors.fill: parent
hoverEnabled: enabled
onClicked: userInfoViewer.visible = false;
onEntered: closeButton.color = hifi.colors.redAccent;
onExited: closeButton.color = hifi.colors.redHighlight;
}
}
}
Item {
id: addressBar
anchors {
top: closeButtonContainer.bottom;
left: parent.left;
right: parent.right;
}
height: 30;
width: parent.width;
FiraSansRegular {
// Properties
text: userInfoViewer.url;
elide: Text.ElideRight;
// Anchors
anchors.fill: parent;
anchors.leftMargin: 5;
// Text Size
size: 14;
// Text Positioning
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft;
// Style
color: hifi.colors.lightGray;
}
}
}
Rectangle {
id: webViewBackground;
color: "white";
visible: userInfoViewer.visible;
anchors {
top: navigationContainer.bottom;
bottom: parent.bottom;
left: parent.left;
right: parent.right;
}
}
HifiControls.WebView {
id: userInfoViewer;
anchors {
top: navigationContainer.bottom;
bottom: parent.bottom;
left: parent.left;
right: parent.right;
}
visible: false;
} }
visible: false;
} }
// Timer used when selecting nearbyTable rows that aren't yet present in the model // Timer used when selecting nearbyTable rows that aren't yet present in the model