X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdrawingview.h;h=344428a804f65549c348eeb9ab3c43d612a7446f;hb=5d8c9e52606315fbfe857f2715b8f051b4f97491;hp=7e5a9d1db52b212509ef5041ba283e7a4c8f9ded;hpb=bf5a50feb0f84a4627a65c5b82c3ca2d2eefe54b;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 7e5a9d1..344428a 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -18,15 +18,13 @@ class DrawingView: public QWidget
 		DrawingView(QWidget * parent = NULL);
 
 	public:
-		void SetGridSize(uint32_t);
-		void UpdateGridBackground(void);
+		void DrawBackground(Painter *);
 		Point SnapPointToGrid(Point);
 		Point SnapPointToAngle(Point);
 		void RenderObjects(Painter *, VPVector &, int, bool ignoreLayer = false);
 		void AddHoveredToSelection(void);
-		void GetSelection(VPVector &);
 		VPVector GetSelection(void);
-		VPVector GetHovered(void);
+		VPVector GetHovered(bool exclude = false);
 		void ToolHandler(int, Point);
 		void ToolDraw(Painter *);
 		void LineHandler(int, Point);
@@ -50,17 +48,21 @@ 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 *);
 		void ObjectSelected(Object *);
+		void NeedZoomUpdate(void);
 
 	protected:
 		void focusOutEvent(QFocusEvent * event);
+		void focusInEvent(QFocusEvent * event);
 		void paintEvent(QPaintEvent * event);
 		void resizeEvent(QResizeEvent * event);
 		void mousePressEvent(QMouseEvent * event);
@@ -71,6 +73,7 @@ class DrawingView: public QWidget
 		void keyReleaseEvent(QKeyEvent * event);
 
 	private:
+		void DrawSubGrid(Painter *, uint32_t, double, Vector, Vector);
 		QPoint GetAdjustedMousePosition(QMouseEvent * event);
 		QPoint GetAdjustedClientPosition(int x, int y);
 
@@ -85,10 +88,15 @@ 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
-	private:
+		double gridPixelsF;						// Grid size in pixels (float)
+//	private:
+	public:
 		bool collided;
 		bool scrollDrag;
 		Vector oldPoint;
@@ -110,7 +118,7 @@ class DrawingView: public QWidget
 		bool draggingObject;
 		bool angleSnap;
 		bool dirty;
+		bool scrollWheelSeen;
 };
 
 #endif	// __DRAWINGVIEW_H__
-