[okular] [Bug 314843] Allow resizing of "stamp" annotations
Albert Astals Cid
bugzilla_noreply at kde.org
Sun Mar 19 22:18:35 UTC 2017
https://bugs.kde.org/show_bug.cgi?id=314843
Albert Astals Cid <aacid at kde.org> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|CONFIRMED |RESOLVED
Latest Commit| |https://commits.kde.org/oku
| |lar/0957abc39ad0597140b068b
| |6f083371df84acf16
Resolution|--- |FIXED
--- Comment #6 from Albert Astals Cid <aacid at kde.org> ---
Git commit 0957abc39ad0597140b068b6f083371df84acf16 by Albert Astals Cid, on
behalf of Tobias Deiminger.
Committed on 19/03/2017 at 22:18.
Pushed by aacid into branch 'master'.
Add annotation resize functionality
Usage:
If you left-click an annotation, it gets selected. Resize handles appear on the
selection rectangle. When cursor is moved over one of the 8 resize handles on
the corners/edges, the cursor shape changes to indicate resize mode. Everywhere
else on the annotation means "move", just as it was before resize feature was
added. Pressing ESC or clicking an area outside the annotation cancels a
selection. Pressing Del deletes a selected annotation.
Feature is only applicable for annotation types AText, AStamp and AGeom.
Implementation:
It works by eventually changing AnnotationPrivate::m_boundary and notifying
generator (i.e. poppler) about that change. Annotation state handling is
shifted out of PageView into a new class MouseAnnotation
(ui/pageviewmouseannotation.cpp). Some functionality not related to resizing
but to annotation interaction in general is also shifted to class
MouseAnnotation, to build a single place of responsiblity.
Other changes:
Add method Document::adjustPageAnnotation, backed by a QUndoCommand.
class Okular::AdjustAnnotationCommand.
Add Annotation::adjust and Annotation::canBeResized methods.
Draw resize handles in PagePainter::paintCroppedPageOnPainter.
Resize and move work
-for types AText, AStamp and AGeom
-on all pages of document
-when viewport position changes
-when zoom level changes
-for all page rotations (0°, 90°, 180°, 270°)
Selection is canceled
-when currently selected annotation is deleted
-on mouse click outside of currently selected annotation
-ESC is pressed
Viewport is shifted when mouse cursor during move/resize comes close to
viewport border.
Resize to negative is prevented.
Tiny annotations are still selectable.
If mouse is moved over an annotation type that we can focus, and the annotation
is not yet focused, mouse cursor shape changes to arrow.
If mouse cursor rests over an annotation A, while annotation B is focused, a
tooltip for annotation A is shown.
Selected Annotation is deleted when Del is pressed.
Test for regressions:
-Annotation interaction (focus, move, resize, start playback, ...) are only
done in mode EnumMouseMode::Browse.
-If mouse is moved over an annotation type where we can start an action, mouse
cursor shape changes to pointing hand.
-If mouse is moved over an annotation type that we can't interact with, mouse
cursor shape stays a open hand.
-If mouse cursor rests over an annotation of any type, a tooltip for that
annotation is shown.
-Grab/move scroll area (on left click + mouse move) is prevented, if mouse is
over focused annotation, or over AMovie/AScreen/AFileAttachment annotation.
-A double click on a annotation starts the "annotator".
REVIEW: 127366
Related: bug 177778, bug 358060
M +1 -0 CMakeLists.txt
M +58 -2 core/annotations.cpp
M +16 -1 core/annotations.h
M +2 -0 core/annotations_p.h
M +13 -6 core/document.cpp
M +14 -1 core/document.h
M +2 -2 core/document_p.h
M +65 -0 core/documentcommands.cpp
M +26 -0 core/documentcommands_p.h
M +1 -1 generators/poppler/annots.cpp
M +5 -2 ui/pagepainter.cpp
M +76 -189 ui/pageview.cpp
A +714 -0 ui/pageviewmouseannotation.cpp [License: GPL (v2+)]
A +164 -0 ui/pageviewmouseannotation.h [License: GPL (v2+)]
https://commits.kde.org/okular/0957abc39ad0597140b068b6f083371df84acf16
--
You are receiving this mail because:
You are the assignee for the bug.
More information about the Okular-devel
mailing list