Fixed click selection and pen functionality.

[architektonas] / src / drawingview.h

diff --git a/src/drawingview.h b/src/drawingview.h
index 136380c127960ae21fa626e04cc8a7beebf61e18..5906766d35b6bd459e0c2ccf9cdca55405a2f60a 100644 (file)
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -22,7 +22,7 @@ class DrawingView: public QWidget
                Point SnapPointToGrid(Point);
                Point SnapPointToAngle(Point);
                void RenderObjects(Painter *, VPVector &, int, bool ignoreLayer = false);
-               void AddHoveredToSelection(void);
+               void HandleSelectionClick(VPVector &);
                VPVector GetSelection(void);
                VPVector GetHovered(bool exclude = false);
                void MoveSelectedToLayer(int);
@@ -51,9 +51,6 @@ class DrawingView: public QWidget
                void HandleLayerToggle(void);
                void HandleLayerSwap(int, int);
                void HandleLayerSwap(int, int, VPVector &);
-               void HandlePenWidth(float);
-               void HandlePenStyle(int);
-               void HandlePenColor(uint32_t);
                void HandlePenStamp(QAction *);
                void HandlePenDropper(QAction *);
 
@@ -93,12 +90,11 @@ class DrawingView: public QWidget
                bool supressSelected;
                QCursor curMarker;
                QCursor curDropper;
+               uint32_t currentSelect;
        public:
                Container document;
                uint32_t gridPixels;                                    // Grid size in pixels
                double gridPixelsF;                                             // Grid size in pixels (float)
-//     private:
-       public:
                bool collided;
                bool scrollDrag;
                Vector oldPoint;
@@ -110,6 +106,7 @@ class DrawingView: public QWidget
                VPVector toolObjects;
                std::vector<Object> toolScratch;
                VPVector toolScratch2;
+               VPVector oldHover;
                Point toolPoint[32];
                Object * toolObj[32];
                double toolParam[32];