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
859b52b7
Commit
859b52b7
authored
7 years ago
by
Clément Fauconnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed a bug where thumbnail views where not correctly updated/highlighted after a drag and drop
parent
a252b908
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
5 deletions
+11
-5
UBBoardController.cpp
src/board/UBBoardController.cpp
+1
-4
UBDocumentContainer.cpp
src/document/UBDocumentContainer.cpp
+2
-1
UBDocumentContainer.h
src/document/UBDocumentContainer.h
+1
-0
UBBoardThumbnailsView.cpp
src/gui/UBBoardThumbnailsView.cpp
+6
-0
UBBoardThumbnailsView.h
src/gui/UBBoardThumbnailsView.h
+1
-0
No files found.
src/board/UBBoardController.cpp
View file @
859b52b7
...
@@ -1586,7 +1586,6 @@ void UBBoardController::moveSceneToIndex(int source, int target)
...
@@ -1586,7 +1586,6 @@ void UBBoardController::moveSceneToIndex(int source, int target)
{
{
if
(
selectedDocument
())
if
(
selectedDocument
())
{
{
persistCurrentScene
(
false
,
true
);
persistCurrentScene
(
false
,
true
);
UBDocumentContainer
::
movePageToIndex
(
source
,
target
);
UBDocumentContainer
::
movePageToIndex
(
source
,
target
);
...
@@ -1598,10 +1597,8 @@ void UBBoardController::moveSceneToIndex(int source, int target)
...
@@ -1598,10 +1597,8 @@ void UBBoardController::moveSceneToIndex(int source, int target)
setActiveDocumentScene
(
target
);
setActiveDocumentScene
(
target
);
mMovingSceneIndex
=
-
1
;
mMovingSceneIndex
=
-
1
;
//on board thumbnails view
emit
moveThumbnailRequired
(
source
,
target
);
emit
activeSceneChanged
();
emit
activeSceneChanged
();
emit
updateThumbnailsRequired
();
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/document/UBDocumentContainer.cpp
View file @
859b52b7
...
@@ -75,7 +75,8 @@ bool UBDocumentContainer::movePageToIndex(int source, int target)
...
@@ -75,7 +75,8 @@ bool UBDocumentContainer::movePageToIndex(int source, int target)
deleteThumbPage
(
source
);
deleteThumbPage
(
source
);
insertThumbPage
(
target
);
insertThumbPage
(
target
);
emit
documentThumbnailsUpdated
(
this
);
emit
documentThumbnailsUpdated
(
this
);
//on board thumbnails view
emit
moveThumbnailRequired
(
source
,
target
);
return
true
;
return
true
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/document/UBDocumentContainer.h
View file @
859b52b7
...
@@ -80,6 +80,7 @@ class UBDocumentContainer : public QObject
...
@@ -80,6 +80,7 @@ class UBDocumentContainer : public QObject
void
addThumbnailRequired
(
UBDocumentContainer
*
source
,
int
index
);
void
addThumbnailRequired
(
UBDocumentContainer
*
source
,
int
index
);
void
removeThumbnailRequired
(
int
index
);
void
removeThumbnailRequired
(
int
index
);
void
moveThumbnailRequired
(
int
from
,
int
to
);
void
moveThumbnailRequired
(
int
from
,
int
to
);
void
updateThumbnailsRequired
();
void
documentThumbnailsUpdated
(
UBDocumentContainer
*
source
);
void
documentThumbnailsUpdated
(
UBDocumentContainer
*
source
);
};
};
...
...
This diff is collapsed.
Click to expand it.
src/gui/UBBoardThumbnailsView.cpp
View file @
859b52b7
...
@@ -78,6 +78,7 @@ UBBoardThumbnailsView::UBBoardThumbnailsView(QWidget *parent, const char *name)
...
@@ -78,6 +78,7 @@ UBBoardThumbnailsView::UBBoardThumbnailsView(QWidget *parent, const char *name)
connect
(
UBApplication
::
boardController
,
SIGNAL
(
addThumbnailRequired
(
UBDocumentContainer
*
,
int
)),
this
,
SLOT
(
addThumbnail
(
UBDocumentContainer
*
,
int
)),
Qt
::
UniqueConnection
);
connect
(
UBApplication
::
boardController
,
SIGNAL
(
addThumbnailRequired
(
UBDocumentContainer
*
,
int
)),
this
,
SLOT
(
addThumbnail
(
UBDocumentContainer
*
,
int
)),
Qt
::
UniqueConnection
);
connect
(
UBApplication
::
boardController
,
SIGNAL
(
moveThumbnailRequired
(
int
,
int
)),
this
,
SLOT
(
moveThumbnail
(
int
,
int
)),
Qt
::
UniqueConnection
);
connect
(
UBApplication
::
boardController
,
SIGNAL
(
moveThumbnailRequired
(
int
,
int
)),
this
,
SLOT
(
moveThumbnail
(
int
,
int
)),
Qt
::
UniqueConnection
);
connect
(
this
,
SIGNAL
(
moveThumbnailRequired
(
int
,
int
)),
this
,
SLOT
(
moveThumbnail
(
int
,
int
)),
Qt
::
UniqueConnection
);
connect
(
this
,
SIGNAL
(
moveThumbnailRequired
(
int
,
int
)),
this
,
SLOT
(
moveThumbnail
(
int
,
int
)),
Qt
::
UniqueConnection
);
connect
(
UBApplication
::
boardController
,
SIGNAL
(
updateThumbnailsRequired
()),
this
,
SLOT
(
updateThumbnails
()),
Qt
::
UniqueConnection
);
connect
(
UBApplication
::
boardController
,
SIGNAL
(
removeThumbnailRequired
(
int
)),
this
,
SLOT
(
removeThumbnail
(
int
)),
Qt
::
UniqueConnection
);
connect
(
UBApplication
::
boardController
,
SIGNAL
(
removeThumbnailRequired
(
int
)),
this
,
SLOT
(
removeThumbnail
(
int
)),
Qt
::
UniqueConnection
);
connect
(
&
mLongPressTimer
,
SIGNAL
(
timeout
()),
this
,
SLOT
(
longPressTimeout
()),
Qt
::
UniqueConnection
);
connect
(
&
mLongPressTimer
,
SIGNAL
(
timeout
()),
this
,
SLOT
(
longPressTimeout
()),
Qt
::
UniqueConnection
);
...
@@ -94,6 +95,11 @@ void UBBoardThumbnailsView::moveThumbnail(int from, int to)
...
@@ -94,6 +95,11 @@ void UBBoardThumbnailsView::moveThumbnail(int from, int to)
updateThumbnailsPos
();
updateThumbnailsPos
();
}
}
void
UBBoardThumbnailsView
::
updateThumbnails
()
{
updateThumbnailsPos
();
}
void
UBBoardThumbnailsView
::
removeThumbnail
(
int
i
)
void
UBBoardThumbnailsView
::
removeThumbnail
(
int
i
)
{
{
UBDraggableThumbnailView
*
item
=
mThumbnails
.
at
(
i
);
UBDraggableThumbnailView
*
item
=
mThumbnails
.
at
(
i
);
...
...
This diff is collapsed.
Click to expand it.
src/gui/UBBoardThumbnailsView.h
View file @
859b52b7
...
@@ -52,6 +52,7 @@ public slots:
...
@@ -52,6 +52,7 @@ public slots:
void
addThumbnail
(
UBDocumentContainer
*
source
,
int
i
);
void
addThumbnail
(
UBDocumentContainer
*
source
,
int
i
);
void
moveThumbnail
(
int
from
,
int
to
);
void
moveThumbnail
(
int
from
,
int
to
);
void
removeThumbnail
(
int
i
);
void
removeThumbnail
(
int
i
);
void
updateThumbnails
();
void
longPressTimeout
();
void
longPressTimeout
();
void
mousePressAndHoldEvent
(
QPoint
pos
);
void
mousePressAndHoldEvent
(
QPoint
pos
);
...
...
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