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
7a9b8969
Commit
7a9b8969
authored
Nov 02, 2017
by
Clément Fauconnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed some bad behaviors around thumbnail views and document persistence
parent
746382ef
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
UBBoardController.cpp
src/board/UBBoardController.cpp
+2
-2
UBBoardThumbnailsView.cpp
src/gui/UBBoardThumbnailsView.cpp
+7
-2
No files found.
src/board/UBBoardController.cpp
View file @
7a9b8969
...
@@ -1539,10 +1539,10 @@ void UBBoardController::setActiveDocumentScene(UBDocumentProxy* pDocumentProxy,
...
@@ -1539,10 +1539,10 @@ void UBBoardController::setActiveDocumentScene(UBDocumentProxy* pDocumentProxy,
mActiveScene
=
targetScene
;
mActiveScene
=
targetScene
;
mActiveSceneIndex
=
index
;
mActiveSceneIndex
=
index
;
persistCurrentScene
();
setDocument
(
pDocumentProxy
,
forceReload
);
setDocument
(
pDocumentProxy
,
forceReload
);
persistCurrentScene
();
updateSystemScaleFactor
();
updateSystemScaleFactor
();
mControlView
->
setScene
(
mActiveScene
);
mControlView
->
setScene
(
mActiveScene
);
...
...
src/gui/UBBoardThumbnailsView.cpp
View file @
7a9b8969
...
@@ -183,14 +183,17 @@ void UBBoardThumbnailsView::resizeEvent(QResizeEvent *event)
...
@@ -183,14 +183,17 @@ void UBBoardThumbnailsView::resizeEvent(QResizeEvent *event)
}
}
void
UBBoardThumbnailsView
::
mousePressEvent
(
QMouseEvent
*
event
)
void
UBBoardThumbnailsView
::
mousePressEvent
(
QMouseEvent
*
event
)
{
{
mLongPressTimer
.
start
();
mLongPressTimer
.
start
();
mLastPressedMousePos
=
event
->
pos
();
mLastPressedMousePos
=
event
->
pos
();
UBDraggableThumbnailView
*
item
=
dynamic_cast
<
UBDraggableThumbnailView
*>
(
itemAt
(
event
->
pos
()));
UBDraggableThumbnailView
*
item
=
dynamic_cast
<
UBDraggableThumbnailView
*>
(
itemAt
(
event
->
pos
()));
if
(
item
)
if
(
item
)
{
UBApplication
::
boardController
->
persistCurrentScene
();
UBApplication
::
boardController
->
setActiveDocumentScene
(
item
->
sceneIndex
());
UBApplication
::
boardController
->
setActiveDocumentScene
(
item
->
sceneIndex
());
}
QGraphicsView
::
mousePressEvent
(
event
);
QGraphicsView
::
mousePressEvent
(
event
);
}
}
...
@@ -202,7 +205,9 @@ void UBBoardThumbnailsView::mouseMoveEvent(QMouseEvent *event)
...
@@ -202,7 +205,9 @@ void UBBoardThumbnailsView::mouseMoveEvent(QMouseEvent *event)
void
UBBoardThumbnailsView
::
longPressTimeout
()
void
UBBoardThumbnailsView
::
longPressTimeout
()
{
{
emit
mousePressAndHoldEventRequired
(
mLastPressedMousePos
);
if
(
QApplication
::
mouseButtons
()
!=
Qt
::
NoButton
)
emit
mousePressAndHoldEventRequired
(
mLastPressedMousePos
);
mLongPressTimer
.
stop
();
mLongPressTimer
.
stop
();
}
}
...
...
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