added multimonitor support

tiemonl · Jul 1, 2018 · 24d4202 · 24d4202
1 parent 1f24cea
commit 24d4202
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 1,230 deletions.
diff --git a/.vs/fisher/v15/.suo b/.vs/fisher/v15/.suo
diff --git a/.vs/fisher/v15/Server/sqlite3/storage.ide b/.vs/fisher/v15/Server/sqlite3/storage.ide
diff --git a/.vs/fisher/v15/sqlite3/storage.ide b/.vs/fisher/v15/sqlite3/storage.ide
diff --git a/fisher/MethodHelper.cs b/fisher/MethodHelper.cs
@@ -88,11 +88,15 @@ public Color GetPixelColor(int x, int y) {
 		}
 
 		private static Bitmap GetScreenShot() {
-			Bitmap result = new Bitmap(Screen.PrimaryScreen.Bounds.Width, Screen.PrimaryScreen.Bounds.Height, PixelFormat.Format32bppArgb);
+			int screenLeft = SystemInformation.VirtualScreen.Left;
+			int screenTop = SystemInformation.VirtualScreen.Top;
+			int screenWidth = SystemInformation.VirtualScreen.Width;
+			int screenHeight = SystemInformation.VirtualScreen.Height;
+
+			Bitmap result = new Bitmap(screenWidth, screenHeight, PixelFormat.Format32bppRgb);
 			{
 				using (Graphics gfx = Graphics.FromImage(result)) {
-					gfx.CopyFromScreen(Screen.PrimaryScreen.Bounds.X, Screen.PrimaryScreen.Bounds.Y, 0, 0, 
-						Screen.PrimaryScreen.Bounds.Size, CopyPixelOperation.SourceCopy);
+					gfx.CopyFromScreen(screenLeft, screenTop, 0, 0, result.Size, CopyPixelOperation.SourceCopy);
 				}
 			}
 			return result;

diff --git a/fisher/bin/Debug/IronOcr.dll b/fisher/bin/Debug/IronOcr.dll
diff --git a/fisher/bin/Debug/IronOcr.xml b/fisher/bin/Debug/IronOcr.xml
diff --git a/fisher/bin/Debug/fisher.exe b/fisher/bin/Debug/fisher.exe
diff --git a/fisher/bin/Debug/fisher.pdb b/fisher/bin/Debug/fisher.pdb
diff --git a/fisher/bin/Release/fisher.exe b/fisher/bin/Release/fisher.exe
diff --git a/fisher/bin/Release/fisher.pdb b/fisher/bin/Release/fisher.pdb
diff --git a/fisher/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/fisher/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/fisher/obj/Debug/fisher.csproj.CoreCompileInputs.cache b/fisher/obj/Debug/fisher.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-b51a733abec9a8799ace15a23411639fc7f87773
+808f7a33c7dbbd03ba8b6f40d76c5e703655a37a
diff --git a/fisher/obj/Debug/fisher.csproj.FileListAbsolute.txt b/fisher/obj/Debug/fisher.csproj.FileListAbsolute.txt
@@ -19,5 +19,3 @@ C:\Users\Liam\Dropbox\Coding Shit\Bit Heroes Fishing\fisher\fisher\obj\Debug\fis
 C:\Users\Liam\Dropbox\Coding Shit\Bit Heroes Fishing\fisher\fisher\obj\Debug\fisher.pdb
 C:\Users\tiemonl1\Dropbox\Coding Shit\Bit Heroes Fishing\fisher\fisher\obj\Debug\fisher.csprojResolveAssemblyReference.cache
 C:\Users\Liam\Dropbox\Coding Shit\Bit Heroes Fishing\fisher\fisher\obj\Debug\fisher.csprojResolveAssemblyReference.cache
-C:\Users\Liam\Dropbox\Coding Shit\Bit Heroes Fishing\fisher\fisher\bin\Debug\IronOcr.dll
-C:\Users\Liam\Dropbox\Coding Shit\Bit Heroes Fishing\fisher\fisher\bin\Debug\IronOcr.xml
diff --git a/fisher/obj/Debug/fisher.exe b/fisher/obj/Debug/fisher.exe
diff --git a/fisher/obj/Debug/fisher.pdb b/fisher/obj/Debug/fisher.pdb
diff --git a/fisher/obj/Release/fisher.exe b/fisher/obj/Release/fisher.exe
diff --git a/fisher/obj/Release/fisher.pdb b/fisher/obj/Release/fisher.pdb
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b51a733abec9a8799ace15a23411639fc7f87773
		808f7a33c7dbbd03ba8b6f40d76c5e703655a37a