Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
1925add4
Commit
1925add4
authored
9 years ago
by
Craig Watson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed video not hiding on 2nd screen when asked to
parent
ca7e8e92
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletion
+14
-1
UBGraphicsItemDelegate.h
src/domain/UBGraphicsItemDelegate.h
+3
-1
UBGraphicsMediaItemDelegate.cpp
src/domain/UBGraphicsMediaItemDelegate.cpp
+10
-0
UBGraphicsMediaItemDelegate.h
src/domain/UBGraphicsMediaItemDelegate.h
+1
-0
No files found.
src/domain/UBGraphicsItemDelegate.h
View file @
1925add4
...
...
@@ -40,6 +40,7 @@
#include <QtGui>
#include <QtSvg>
#include <QMimeData>
#include <QGraphicsVideoItem>
#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
<
DelegateButton
*>
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
;
...
...
This diff is collapsed.
Click to expand it.
src/domain/UBGraphicsMediaItemDelegate.cpp
View file @
1925add4
...
...
@@ -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
);
}
This diff is collapsed.
Click to expand it.
src/domain/UBGraphicsMediaItemDelegate.h
View file @
1925add4
...
...
@@ -54,6 +54,7 @@ class UBGraphicsMediaItemDelegate : public UBGraphicsItemDelegate
void
toggleMute
();
void
updateTicker
(
qint64
time
);
virtual
void
showHide
(
bool
show
);
protected
slots
:
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment