Object movement and moving objects to intersections.

[architektonas] / src / drawingview.h

diff --git a/src/drawingview.h b/src/drawingview.h
index 849ce76b2c943a1d2a07070d1585c54107434b60..1af3a7776506a98fe1de0fbeec85a699ab90e88b 100644 (file)
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -3,6 +3,7 @@
 
 #include <QtWidgets>
 #include <stdint.h>
+#include "rect.h"
 #include "structs.h"
 
 enum { ToolMouseDown, ToolMouseMove, ToolMouseUp, ToolKeyDown, ToolKeyUp, ToolCleanup };
@@ -20,7 +21,7 @@ class DrawingView: public QWidget
                void SetGridSize(uint32_t);
                void UpdateGridBackground(void);
                Point SnapPointToGrid(Point);
-               void RenderObjects(Painter *, std::vector<void *> &);
+               void RenderObjects(Painter *, std::vector<void *> &, int, bool ignoreLayer = false);
                void AddHoveredToSelection(void);
                void GetSelection(std::vector<void *> &);
                void GetHovered(std::vector<void *> &);
@@ -31,12 +32,19 @@ class DrawingView: public QWidget
                void ArcHandler(int, Point);
                void RotateHandler(int, Point);
                void MirrorHandler(int, Point);
+               Rect GetObjectExtents(Object *);
                void CheckObjectBounds(void);
                bool HitTestObjects(Point);
+               bool HitTest(Object *, Point);
                void HandleObjectMovement(Point);
 
        public slots:
-               void SetCurrentLayer(int);
+               void DeleteCurrentLayer(int);
+               void HandleLayerToggle(void);
+               void HandleLayerSwap(int, int);
+
+       signals:
+               void ObjectHovered(Object *);
 
        protected:
                void paintEvent(QPaintEvent * event);
@@ -54,7 +62,7 @@ class DrawingView: public QWidget
 
        public:
                bool useAntialiasing;
-               uint32_t numSelected;
+//             uint32_t numSelected;
                uint32_t numHovered;
                bool shiftDown;
                bool ctrlDown;
@@ -78,9 +86,10 @@ class DrawingView: public QWidget
                std::vector<void *> toolObjects;
                std::vector<Object> toolScratch;
                Point toolPoint[32];
-
-//     public:
-//             static Container document;
+               Point intersectionPoint;
+               bool hoveringIntersection;
+               Object * dragged;
+               bool draggingObject;
 };
 
 #endif // __DRAWINGVIEW_H__