Fix scrollwheel zooming from walking all over the screen.

[architektonas] / src / drawingview.h

diff --git a/src/drawingview.h b/src/drawingview.h
index 08f347f6cac05e26193f9df07e9114f30a86296c..d252ffcf3515e5273c74c48e6cdb33554daf2a26 100644 (file)
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -22,10 +22,10 @@ class DrawingView: public QWidget
                void UpdateGridBackground(void);
                Point SnapPointToGrid(Point);
                Point SnapPointToAngle(Point);
-               void RenderObjects(Painter *, std::vector<void *> &, int, bool ignoreLayer = false);
+               void RenderObjects(Painter *, VPVector &, int, bool ignoreLayer = false);
                void AddHoveredToSelection(void);
-               void GetSelection(std::vector<void *> &);
-               void GetHovered(std::vector<void *> &);
+               VPVector GetSelection(void);
+               VPVector GetHovered(void);
                void ToolHandler(int, Point);
                void ToolDraw(Painter *);
                void LineHandler(int, Point);
@@ -34,12 +34,16 @@ class DrawingView: public QWidget
                void RotateHandler(int, Point);
                void MirrorHandler(int, Point);
                void DimensionHandler(int, Point);
+               void TriangulateHandler(int, Point);
+               void TrimHandler(int, Point);
+               void ParallelHandler(int, Point);
                Rect GetObjectExtents(Object *);
                void CheckObjectBounds(void);
                bool HitTestObjects(Point);
                bool HitTest(Object *, Point);
                bool HandleObjectClicked(void);
                void HandleObjectMovement(Point);
+               void AddDimensionTo(void * obj);
 
        public slots:
                void DeleteCurrentLayer(int);
@@ -48,12 +52,14 @@ class DrawingView: public QWidget
                void HandlePenWidth(float);
                void HandlePenStyle(int);
                void HandlePenColor(uint32_t);
+               void HandlePenStamp(void);
 
        signals:
                void ObjectHovered(Object *);
                void ObjectSelected(Object *);
 
        protected:
+               void focusOutEvent(QFocusEvent * event);
                void paintEvent(QPaintEvent * event);
                void resizeEvent(QResizeEvent * event);
                void mousePressEvent(QMouseEvent * event);
@@ -69,7 +75,6 @@ class DrawingView: public QWidget
 
        public:
                bool useAntialiasing;
-//             uint32_t numSelected;
                uint32_t numHovered;
                bool shiftDown;
                bool ctrlDown;
@@ -90,11 +95,12 @@ class DrawingView: public QWidget
                QString informativeText;
 
        public:
-               std::vector<void *> select;
-               std::vector<void *> hover;
-               std::vector<void *> toolObjects;
+               VPVector select;
+               VPVector toolObjects;
                std::vector<Object> toolScratch;
+               VPVector toolScratch2;
                Point toolPoint[32];
+               Object * toolObj[32];
                Point intersectionPoint;
                Point hoverPoint;
                bool hoverPointValid;
@@ -102,6 +108,8 @@ class DrawingView: public QWidget
                Object * dragged;
                bool draggingObject;
                bool angleSnap;
+               bool dirty;
+               bool scrollWheelSeen;
 };
 
 #endif // __DRAWINGVIEW_H__