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

Fix commerce setting handle

Browse source
This commit is contained in:
Zach Fox 2017-09-28 10:42:45 -07:00
parent 8d74487393
commit b5dc6b791b
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/ui/overlays/ContextOverlayInterface.cpp
View file

@ -201,7 +201,8 @@ bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityIt
void ContextOverlayInterface::contextOverlays_mousePressOnOverlay(const OverlayID& overlayID, const PointerEvent& event) { void ContextOverlayInterface::contextOverlays_mousePressOnOverlay(const OverlayID& overlayID, const PointerEvent& event) {
if (overlayID == _contextOverlayID && event.getButton() == PointerEvent::PrimaryButton) { if (overlayID == _contextOverlayID && event.getButton() == PointerEvent::PrimaryButton) {
qCDebug(context_overlay) << "Clicked Context Overlay. Entity ID:" << _currentEntityWithContextOverlay << "Overlay ID:" << overlayID; qCDebug(context_overlay) << "Clicked Context Overlay. Entity ID:" << _currentEntityWithContextOverlay << "Overlay ID:" << overlayID;
if (_commerceSettingSwitch.get()) { Setting::Handle<bool> _settingSwitch{ "commerce", false };
if (_settingSwitch.get()) {
openInspectionCertificate(); openInspectionCertificate();
} else { } else {
openMarketplace(); openMarketplace();

2
interface/src/ui/overlays/ContextOverlayInterface.h
View file

@ -79,8 +79,6 @@ private:
bool _isInMarketplaceInspectionMode { false }; bool _isInMarketplaceInspectionMode { false };
Setting::Handle<bool> _commerceSettingSwitch{ "commerce", false };
void openInspectionCertificate(); void openInspectionCertificate();
void openMarketplace(); void openMarketplace();
void enableEntityHighlight(const EntityItemID& entityItemID); void enableEntityHighlight(const EntityItemID& entityItemID);

2
libraries/ui/src/ui/types/RequestFilters.cpp
View file

@ -61,7 +61,7 @@ void RequestFilters::interceptHFWebEngineRequest(QWebEngineUrlRequestInfo& info)
// During the period in which we have HFC commerce in the system, but not applied everywhere: // During the period in which we have HFC commerce in the system, but not applied everywhere:
const QString tokenStringCommerce{ "Chrome/48.0 (HighFidelityInterface WithHFC)" }; const QString tokenStringCommerce{ "Chrome/48.0 (HighFidelityInterface WithHFC)" };
static Setting::Handle<bool> _settingSwitch{ "commerce", false }; Setting::Handle<bool> _settingSwitch{ "commerce", false };
bool isMoney = _settingSwitch.get(); bool isMoney = _settingSwitch.get();
const QString tokenString = !isAuthable ? tokenStringMobile : (isMoney ? tokenStringCommerce : tokenStringMetaverse); const QString tokenString = !isAuthable ? tokenStringMobile : (isMoney ? tokenStringCommerce : tokenStringMetaverse);