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

QmlMarketplace - fix issue with footer not appearing in marketplaces list

Browse source
This commit is contained in:
Roxanne Skelly 2019-02-04 15:04:18 -08:00
parent 1840f874ab
commit e23c589de7
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -596,7 +596,9 @@ Rectangle {
anchors.fill: parent anchors.fill: parent
Component.onCompleted: { Component.onCompleted: {
loadHtml("<html><head><style>body { color: #393939; font-family: Arial !important;}</style></head><body>"+model.text+"</body></html>"); descriptionWebView.enabled = false;
loadHtml("<html><head><style>body { overflow: hidden; color: #393939; font-family: Arial !important;}</style></head><body>"+model.text+"</body></html>");
descriptionWebView.enabled = true;
} }
onContentsSizeChanged: { onContentsSizeChanged: {

2
scripts/system/marketplaces/marketplaces.js
View file

@ -41,6 +41,7 @@ var GOTO_DIRECTORY = "GOTO_DIRECTORY";
var GOTO_MARKETPLACE = "GOTO_MARKETPLACE"; var GOTO_MARKETPLACE = "GOTO_MARKETPLACE";
var QUERY_CAN_WRITE_ASSETS = "QUERY_CAN_WRITE_ASSETS"; var QUERY_CAN_WRITE_ASSETS = "QUERY_CAN_WRITE_ASSETS";
var CAN_WRITE_ASSETS = "CAN_WRITE_ASSETS"; var CAN_WRITE_ASSETS = "CAN_WRITE_ASSETS";
var WARN_USER_NO_PERMISSIONS = "WARN_USER_NO_PERMISSIONS";
var CLARA_DOWNLOAD_TITLE = "Preparing Download"; var CLARA_DOWNLOAD_TITLE = "Preparing Download";
var messageBox = null; var messageBox = null;
@ -436,6 +437,7 @@ function rezEntity(itemHref, itemType, marketplaceItemTesterId) {
var referrerURL; // Used for updating Purchases QML var referrerURL; // Used for updating Purchases QML
var filterText; // Used for updating Purchases QML var filterText; // Used for updating Purchases QML
function onWebEventReceived(message) { function onWebEventReceived(message) {
message = JSON.parse(message);
if (message.type === GOTO_MARKETPLACE) { if (message.type === GOTO_MARKETPLACE) {
openMarketplace(message.itemId); openMarketplace(message.itemId);
} else if (message.type === GOTO_DIRECTORY) { } else if (message.type === GOTO_DIRECTORY) {