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
346b693c
Commit
346b693c
authored
May 23, 2012
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'Sankore-1.40' of github.com:Sankore/Sankore-3.1 into Sankore-1.40
parents
b1bdf7f0
065c3d12
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
UBBoardView.cpp
src/board/UBBoardView.cpp
+1
-0
UBGraphicsVideoItem.cpp
src/domain/UBGraphicsVideoItem.cpp
+3
-0
No files found.
src/board/UBBoardView.cpp
View file @
346b693c
...
@@ -426,6 +426,7 @@ UBBoardView::mousePressEvent (QMouseEvent *event)
...
@@ -426,6 +426,7 @@ UBBoardView::mousePressEvent (QMouseEvent *event)
if
(
!
movingItem
if
(
!
movingItem
||
movingItem
->
isSelected
()
||
movingItem
->
isSelected
()
||
movingItem
->
data
(
UBGraphicsItemData
::
ItemLocked
).
toBool
()
||
movingItem
->
type
()
==
UBGraphicsDelegateFrame
::
Type
||
movingItem
->
type
()
==
UBGraphicsDelegateFrame
::
Type
||
movingItem
->
type
()
==
DelegateButton
::
Type
||
movingItem
->
type
()
==
DelegateButton
::
Type
||
movingItem
->
type
()
==
UBGraphicsCompass
::
Type
||
movingItem
->
type
()
==
UBGraphicsCompass
::
Type
...
...
src/domain/UBGraphicsVideoItem.cpp
View file @
346b693c
...
@@ -120,6 +120,9 @@ void UBGraphicsVideoItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
...
@@ -120,6 +120,9 @@ void UBGraphicsVideoItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
void
UBGraphicsVideoItem
::
mouseMoveEvent
(
QGraphicsSceneMouseEvent
*
event
)
void
UBGraphicsVideoItem
::
mouseMoveEvent
(
QGraphicsSceneMouseEvent
*
event
)
{
{
if
(
mDelegate
->
delegated
()
->
data
(
UBGraphicsItemData
::
ItemLocked
).
toBool
())
return
;
if
(
mShouldMove
&&
(
event
->
buttons
()
&
Qt
::
LeftButton
))
if
(
mShouldMove
&&
(
event
->
buttons
()
&
Qt
::
LeftButton
))
{
{
QPointF
offset
=
event
->
scenePos
()
-
mMousePressPos
;
QPointF
offset
=
event
->
scenePos
()
-
mMousePressPos
;
...
...
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