Miscellaneous fixes/updates:

[architektonas] / src / drawingview.h

diff --git a/src/drawingview.h b/src/drawingview.h
index 441b7a8eb61cecfd2b080bc636b11b00000faee8..344428a804f65549c348eeb9ab3c43d612a7446f 100644 (file)
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -19,16 +19,12 @@ class DrawingView: public QWidget
 
        public:
                void DrawBackground(Painter *);
-               void SetGridSize(uint32_t);
-               void SetGridSize(double);
-               void UpdateGridBackground(void);
-               void UpdateGridBackgroundF(void);
                Point SnapPointToGrid(Point);
                Point SnapPointToAngle(Point);
                void RenderObjects(Painter *, VPVector &, int, bool ignoreLayer = false);
                void AddHoveredToSelection(void);
                VPVector GetSelection(void);
-               VPVector GetHovered(void);
+               VPVector GetHovered(bool exclude = false);
                void ToolHandler(int, Point);
                void ToolDraw(Painter *);
                void LineHandler(int, Point);
@@ -52,10 +48,12 @@ class DrawingView: public QWidget
                void DeleteCurrentLayer(int);
                void HandleLayerToggle(void);
                void HandleLayerSwap(int, int);
+               void HandleLayerSwap(int, int, VPVector &);
                void HandlePenWidth(float);
                void HandlePenStyle(int);
                void HandlePenColor(uint32_t);
-               void HandlePenStamp(void);
+               void HandlePenStamp(QAction *);
+               void HandlePenDropper(QAction *);
 
        signals:
                void ObjectHovered(Object *);
@@ -64,6 +62,7 @@ class DrawingView: public QWidget
 
        protected:
                void focusOutEvent(QFocusEvent * event);
+               void focusInEvent(QFocusEvent * event);
                void paintEvent(QPaintEvent * event);
                void resizeEvent(QResizeEvent * event);
                void mousePressEvent(QMouseEvent * event);
@@ -89,6 +88,9 @@ class DrawingView: public QWidget
                QPixmap gridBackground;
                double scale;                                                   // Window scaling factor
                int32_t offsetX, offsetY;                               // Window offsets
+               bool supressSelected;
+               QCursor curMarker;
+               QCursor curDropper;
        public:
                Container document;
                uint32_t gridPixels;                                    // Grid size in pixels
@@ -120,4 +122,3 @@ class DrawingView: public QWidget
 };
 
 #endif // __DRAWINGVIEW_H__
-