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
f619a0f2
Commit
f619a0f2
authored
Jul 18, 2013
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
media item no more resized on click. First try to fix the lcdwidget
parent
954dfa60
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
34 deletions
+17
-34
UBGraphicsItemDelegate.cpp
src/domain/UBGraphicsItemDelegate.cpp
+6
-6
UBGraphicsItemDelegate.h
src/domain/UBGraphicsItemDelegate.h
+0
-2
UBGraphicsMediaItemDelegate.cpp
src/domain/UBGraphicsMediaItemDelegate.cpp
+11
-26
No files found.
src/domain/UBGraphicsItemDelegate.cpp
View file @
f619a0f2
...
...
@@ -1312,12 +1312,11 @@ void DelegateMediaControl::positionHandles()
mDisplayFormat
=
"ss"
;
if
(
tTotal
.
minute
()
>
0
)
{
mDisplayFormat
=
"mm:"
+
mDisplayFormat
;
digitsCount
+=
3
;
timerWidth
+=
mLCDTimerArea
.
height
()
*
0.5
;
}
//Explanation at least the second and minutes are diplayed
mDisplayFormat
=
"mm:"
+
mDisplayFormat
;
digitsCount
+=
3
;
timerWidth
+=
mLCDTimerArea
.
height
();
if
(
tTotal
.
hour
()
>
0
)
{
...
...
@@ -1348,6 +1347,7 @@ void DelegateMediaControl::update()
QTime
tCurrent
;
tCurrent
=
tCurrent
.
addMSecs
(
mCurrentTimeInMs
<
0
?
0
:
mCurrentTimeInMs
);
lcdTimer
->
display
(
tCurrent
.
toString
(
mDisplayFormat
));
QGraphicsRectItem
::
update
();
...
...
src/domain/UBGraphicsItemDelegate.h
View file @
f619a0f2
...
...
@@ -174,7 +174,6 @@ class DelegateMediaControl: public QObject, public QGraphicsRectItem
void
positionHandles
();
void
updateTicker
(
qint64
time
);
void
totalTimeChanged
(
qint64
newTotalTime
);
QSizeF
lcdAreaSize
()
{
return
mLCDTimerArea
.
size
();}
signals
:
void
used
();
...
...
@@ -286,7 +285,6 @@ class UBGraphicsItemDelegate : public QObject
UBGraphicsFlags
ubflags
()
const
{
return
mFlags
;}
bool
testUBFlags
(
UBGraphicsFlags
pf
)
const
{
return
mFlags
&
pf
;}
void
setUBFlags
(
UBGraphicsFlags
pf
);
// void addUBFlags(UBGraphicsFlags pf) {setUBFlags(ubflags() | pf);}
void
setUBFlag
(
UBGraphicsFlags
pf
,
bool
set
=
true
);
signals
:
...
...
src/domain/UBGraphicsMediaItemDelegate.cpp
View file @
f619a0f2
...
...
@@ -73,6 +73,7 @@ bool UBGraphicsMediaItemDelegate::mousePressEvent(QGraphicsSceneMouseEvent *even
{
Q_UNUSED
(
event
);
mToolBarItem
->
show
();
positionHandles
();
if
(
mToolBarShowTimer
)
mToolBarShowTimer
->
start
();
...
...
@@ -119,20 +120,16 @@ void UBGraphicsMediaItemDelegate::buildButtons()
connect
(
mMuteButton
,
SIGNAL
(
clicked
(
bool
)),
mToolBarShowTimer
,
SLOT
(
start
()));
}
// UBGraphicsMediaItem *audioItem = dynamic_cast<UBGraphicsMediaItem*>(mDelegated);
// if (audioItem)
// {
// if (audioItem->getMediaType() == UBGraphicsMediaItem::mediaType_Audio)
// {
positionHandles
();
// }
// }
positionHandles
();
}
UBGraphicsMediaItemDelegate
::~
UBGraphicsMediaItemDelegate
()
{
if
(
mToolBarShowTimer
)
if
(
mToolBarShowTimer
)
{
delete
mToolBarShowTimer
;
mToolBarShowTimer
=
NULL
;
}
}
void
UBGraphicsMediaItemDelegate
::
positionHandles
()
...
...
@@ -144,32 +141,20 @@ void UBGraphicsMediaItemDelegate::positionHandles()
{
QRectF
toolBarRect
=
mToolBarItem
->
rect
();
mToolBarItem
->
setPos
(
0
,
delegated
()
->
boundingRect
().
height
()
-
mToolBarItem
->
rect
().
height
());
mToolBarItem
->
setPos
(
0
,
mediaItem
->
boundingRect
().
height
()
-
mToolBarItem
->
rect
().
height
());
toolBarRect
.
setWidth
(
delegated
()
->
boundingRect
().
width
());
toolBarRect
.
setWidth
(
mediaItem
->
boundingRect
().
width
());
mToolBarItem
->
show
();
mToolBarItem
->
setRect
(
toolBarRect
);
}
int
toolBarMinimumWidth
=
0
;
int
mediaItemWidth
=
mToolBarItem
->
boundingRect
().
width
();
int
toolBarButtons
=
0
;
foreach
(
DelegateButton
*
button
,
mToolBarButtons
)
{
mediaItemWidth
-=
button
->
boundingRect
().
width
()
+
mToolBarItem
->
getElementsPadding
();
toolBarMinimumWidth
+=
button
->
boundingRect
().
width
()
+
mToolBarItem
->
getElementsPadding
();
}
toolBarMinimumWidth
+=
mToolBarItem
->
boundingRect
().
height
();
QWidget
*
pAudioWidget
=
delegated
()
->
widget
();
if
(
pAudioWidget
)
{
pAudioWidget
->
setMinimumSize
(
toolBarMinimumWidth
+
(
int
)
mMediaControl
->
lcdAreaSize
().
width
()
+
(
int
)
mMediaControl
->
rect
().
height
(),
26
);
}
toolBarButtons
+=
button
->
boundingRect
().
width
()
+
mToolBarItem
->
getElementsPadding
();
QRectF
mediaItemRect
=
mMediaControl
->
rect
();
mediaItemRect
.
setWidth
(
mediaItem
Width
);
mediaItemRect
.
setWidth
(
mediaItem
->
boundingRect
().
width
()
-
toolBarButtons
);
mediaItemRect
.
setHeight
(
mToolBarItem
->
boundingRect
().
height
());
mMediaControl
->
setRect
(
mediaItemRect
);
...
...
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