X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdrawingview.h;h=1e050e8f1d72917c14f487d8e306dffc0d5d7fbc;hb=deb5512a6b35e73dc2c19ac4d2800cff87dd2e71;hp=3d22b44e83e97224b9e1c38eee3201d56972d2b0;hpb=a398911ea125eb6b25320e96599e0ae39b720cf8;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 3d22b44..1e050e8 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -18,16 +18,19 @@ class DrawingView: public QWidget
 		void SetGridSize(uint32_t);
 		void UpdateGridBackground(void);
 		Point SnapPointToGrid(Point);
-		void RenderObjects(Painter *, Container *);
+		void RenderObjects(Painter *, std::vector<void *> &);
 		void DeleteSelectedItems(void);
 		void ClearSelection(void);
 		void AddHoveredToSelection(void);
 		void GetSelection(std::vector<void *> &);
 		void GetHovered(std::vector<void *> &);
-		void ToolMouseDown(Point);
-		void ToolMouseMove(Point);
-		void ToolMouseUp(Point);
+		void ToolMouse(int, Point);
 		void ToolDraw(Painter *);
+		void LineHandler(int, Point);
+		void RotateHandler(int, Point);
+		void CheckObjectBounds(void);
+		bool HitTestObjects(Point);
+		void HandleObjectMovement(Point);
 
 	public slots:
 		void AddNewObjectToDocument(Object *);
@@ -54,6 +57,7 @@ class DrawingView: public QWidget
 		uint32_t numHovered;
 		bool shiftDown;
 		bool ctrlDown;
+		bool overrideColor;
 
 	private:
 		QPixmap gridBackground;
@@ -70,13 +74,9 @@ class DrawingView: public QWidget
 	public:
 		std::vector<void *> select;
 		std::vector<void *> hover;
-//		int toolState;
+		std::vector<void *> toolObjects;
 		Point toolPoint[32];
-//		Object * toolObject;
 
-	// Tool methods (static)
-	public:
-//		static void foo();
 //	public:
 //		static Container document;
 };