Mercurial > hg > svgui

diff layer/TextLayer.h @ 1459:42c87368287c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch single-point
author Chris Cannam
date Fri, 17 May 2019 10:02:52 +0100
parents e2b6a13a1f69
children 696e569ff21b
line wrap: on
line diff
--- a/layer/TextLayer.h	Wed Apr 24 11:29:53 2019 +0100
+++ b/layer/TextLayer.h	Fri May 17 10:02:52 2019 +0100
@@ -96,18 +96,18 @@
 
     int getDefaultColourHint(bool dark, bool &impose) override;
 
-    TextModel::PointList getLocalPoints(LayerGeometryProvider *v, int x, int y) const;
+    EventVector getLocalPoints(LayerGeometryProvider *v, int x, int y) const;
 
-    bool getPointToDrag(LayerGeometryProvider *v, int x, int y, TextModel::Point &) const;
+    bool getPointToDrag(LayerGeometryProvider *v, int x, int y, Event &) const;
 
     TextModel *m_model;
     bool m_editing;
     QPoint m_editOrigin;
-    TextModel::Point m_originalPoint;
-    TextModel::Point m_editingPoint;
-    TextModel::EditCommand *m_editingCommand;
+    Event m_originalPoint;
+    Event m_editingPoint;
+    ChangeEventsCommand *m_editingCommand;
 
-    void finish(TextModel::EditCommand *command) {
+    void finish(ChangeEventsCommand *command) {
         Command *c = command->finish();
         if (c) CommandHistory::getInstance()->addCommand(c, false);
     }