Added pen and dropper tools, and printing support.

[architektonas] / src / global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index e408a5deb2eb7ac53e9a469c3ee39fc0ee095535..9ec2a7bba529187dd2040f1a6de2102a8a78a1dd 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -27,7 +27,6 @@ int Global::tool = TTNone;
 int Global::toolState = TSNone;
 
 double Global::gridSpacing;
-int Global::currentLayer = 0;
 Point Global::snapPoint;
 bool Global::snapPointIsValid = false;
 uint32_t Global::objectID = 1;
@@ -42,6 +41,7 @@ float Global::penWidth = 1.0;
 int Global::penStyle = 1;
 uint32_t Global::penColor = 0x000000;
 bool Global::penStamp = false;
+bool Global::penDropper = false;
 
 Point Global::intersectPoint[16]; // Overkill, yes
 double Global::intersectParam[16]; // Ditto
@@ -50,6 +50,6 @@ int Global::numIntersectParams = 0;
 
 int Global::activeLayer = 0;
 int Global::numLayers = 1;
-std::vector<bool> Global::layerHidden;
-std::vector<bool> Global::layerLocked;
-
+BVector Global::layerHidden;
+BVector Global::layerLocked;
+SVector Global::layerName;