From 1925add46054fb5ff3adb917832c952768827a98 Mon Sep 17 00:00:00 2001 From: Craig Watson Date: Tue, 23 Feb 2016 15:32:40 +0100 Subject: [PATCH] Fixed video not hiding on 2nd screen when asked to --- src/domain/UBGraphicsItemDelegate.h | 4 +++- src/domain/UBGraphicsMediaItemDelegate.cpp | 10 ++++++++++ src/domain/UBGraphicsMediaItemDelegate.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/domain/UBGraphicsItemDelegate.h b/src/domain/UBGraphicsItemDelegate.h index b2096b45..c18bf0b1 100644 --- a/src/domain/UBGraphicsItemDelegate.h +++ b/src/domain/UBGraphicsItemDelegate.h @@ -40,6 +40,7 @@ #include #include #include +#include #include "core/UB.h" #include "core/UBSettings.h" @@ -320,6 +321,8 @@ class UBGraphicsItemDelegate : public QObject virtual void decorateMenu(QMenu *menu); virtual void updateMenuActionState(); + void showHideRecurs(const QVariant &pShow, QGraphicsItem *pItem); + QList buttons() {return mButtons;} QGraphicsItem* mDelegated; @@ -352,7 +355,6 @@ protected slots: private: void updateFrame(); void updateButtons(bool showUpdated = false); - inline void showHideRecurs(const QVariant &pShow, QGraphicsItem *pItem); QPointF mOffset; QTransform mPreviousTransform; diff --git a/src/domain/UBGraphicsMediaItemDelegate.cpp b/src/domain/UBGraphicsMediaItemDelegate.cpp index 839ad434..8f023706 100644 --- a/src/domain/UBGraphicsMediaItemDelegate.cpp +++ b/src/domain/UBGraphicsMediaItemDelegate.cpp @@ -310,3 +310,13 @@ void UBGraphicsMediaItemDelegate::totalTimeChanged(qint64 newTotalTime) { mMediaControl->totalTimeChanged(newTotalTime); } + +void UBGraphicsMediaItemDelegate::showHide(bool show) +{ + QVariant showFlag = QVariant(show ? UBItemLayerType::Object : UBItemLayerType::Control); + showHideRecurs(showFlag, mDelegated); + showHideRecurs(showFlag, delegated()->videoItem()); + mDelegated->update(); + + emit showOnDisplayChanged(show); +} diff --git a/src/domain/UBGraphicsMediaItemDelegate.h b/src/domain/UBGraphicsMediaItemDelegate.h index 8cb47b3b..3031a738 100644 --- a/src/domain/UBGraphicsMediaItemDelegate.h +++ b/src/domain/UBGraphicsMediaItemDelegate.h @@ -54,6 +54,7 @@ class UBGraphicsMediaItemDelegate : public UBGraphicsItemDelegate void toggleMute(); void updateTicker(qint64 time); + virtual void showHide(bool show); protected slots: