mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-24 18:35:37 +00:00
Merge remote-tracking branch 'origin/Applications/17.04'
This commit is contained in:
commit
4e04c12d18
|
@ -956,6 +956,9 @@ void PageView::notifySetup( const QVector< Okular::Page * > & pageSet, int setup
|
|||
return;
|
||||
}
|
||||
|
||||
// mouseAnnotation must not access our PageViewItem widgets any longer
|
||||
d->mouseAnnotation->reset();
|
||||
|
||||
// delete all widgets (one for each page in pageSet)
|
||||
QVector< PageViewItem * >::const_iterator dIt = d->items.constBegin(), dEnd = d->items.constEnd();
|
||||
for ( ; dIt != dEnd; ++dIt )
|
||||
|
|
|
@ -414,6 +414,13 @@ void MouseAnnotation::cancel()
|
|||
}
|
||||
}
|
||||
|
||||
void MouseAnnotation::reset()
|
||||
{
|
||||
cancel();
|
||||
m_focusedAnnotation.invalidate();
|
||||
m_mouseOverAnnotation.invalidate();
|
||||
}
|
||||
|
||||
/* Handle state changes for the focused annotation. */
|
||||
void MouseAnnotation::setState( MouseAnnotationState state, const AnnotationDescription & ad )
|
||||
{
|
||||
|
|
|
@ -93,6 +93,9 @@ public:
|
|||
/* Cancel the current selection or action, if any. */
|
||||
void cancel();
|
||||
|
||||
/* Reset to initial state. Cancel current action and relinquish references to PageViewItem widgets. */
|
||||
void reset();
|
||||
|
||||
Okular::Annotation * annotation() const;
|
||||
|
||||
/* Return true, if MouseAnnotation demands control for a mouse click on the current cursor position. */
|
||||
|
|
Loading…
Reference in a new issue