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

Qml Marketplace - remove some quest incompatibilities and disable

Browse source 
links for quest
This commit is contained in:
Roxanne Skelly 2019-02-07 12:56:55 -08:00
parent d3bc536b58
commit d04445c244
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/resources/qml/hifi/commerce/marketplace/MarketplaceItem.qml
View file

@ -14,8 +14,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.9 import QtQuick 2.9
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import QtGraphicalEffects 1.0
import QtWebEngine 1.5
import stylesUit 1.0 import stylesUit 1.0
import controlsUit 1.0 as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
import "../../../controls" as HifiControls import "../../../controls" as HifiControls
@ -424,13 +422,13 @@ Rectangle {
elide: Text.ElideRight elide: Text.ElideRight
size: 14 size: 14
color: model.link ? hifi.colors.blueHighlight : hifi.colors.baseGray color: (model.link && root.supports3DHTML)? hifi.colors.blueHighlight : hifi.colors.baseGray
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
onClicked: { onClicked: {
if (model.link) { if (model.link && root.supports3DHTML) {
sendToScript({method: 'marketplace_open_link', link: model.link}); sendToScript({method: 'marketplace_open_link', link: model.link});
} }
} }
@ -571,13 +569,15 @@ Rectangle {
text: root.description text: root.description
size: 14 size: 14
color: hifi.colors.lightGray color: hifi.colors.lightGray
linkColor: hifi.colors.blueHighlight linkColor: root.supports3DHTML ? hifi.colors.blueHighlight : hifi.colors.lightGray
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
textFormat: Text.RichText textFormat: Text.RichText
wrapMode: Text.Wrap wrapMode: Text.Wrap
onLinkActivated: { onLinkActivated: {
if (root.supports3DHTML) {
sendToScript({method: 'marketplace_open_link', link: link}); sendToScript({method: 'marketplace_open_link', link: link});
} }
}
onHeightChanged: { footer.evalHeight(); } onHeightChanged: { footer.evalHeight(); }
} }