Merge remote-tracking branch 'origin/alex/dev'

Conflicts:
	Program.cs
	Properties/AssemblyInfo.cs

BorderlessGaming.csproj

@@ -58,7 +58,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.5.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

CompactWindow.cs

@@ -126,17 +126,24 @@ private void PopulateList() //Adds active windows to the processDataList
             processList.DataSource = _tempList;
             var processlist = Process.GetProcesses();
 
-            foreach (
-                var process in
-                    processlist.Where(process => process != null)
-                        .Where(process => !process.ProcessName.Equals("explorer")))
+            foreach (var process in processlist)
             {
+                if (process == null)
+                {
+                    continue;
+                }
+                if (process.ProcessName.Equals("explorer"))
+                {
+                    continue;
+                }
                 if (String.IsNullOrEmpty(process.MainWindowTitle))
                 {
                     Native.SetWindowText(process.MainWindowHandle, process.ProcessName);
                 }
-                if (process.MainWindowTitle.Length <= 0) continue;
-                _processDataList.Add(process.ProcessName);
+                if (process.MainWindowTitle.Length > 0)
+                {
+                    _processDataList.Add(process.ProcessName);
+                }
             }
 
 
@@ -190,16 +197,16 @@ private void RemoveBorder(String procName) //actually make it frameless
                 //If on multiple screens it will grab bounds from the screen it is most on.  
                 //If not on any screen it grabs bounds from the screen closest
                 var bounds = Screen.FromHandle(pFoundWindow).Bounds;
-                
+
                 if (!_borderlessWindows.Contains(pFoundWindow.ToInt32().ToString()))
                 {
                     //Using bounds.X and bounds.Y instead of 0, 0 so it will orient the window 
                     //on the screen it is currently occupying instead of using the primary screen
                     Native.SetWindowPos(pFoundWindow, 0, bounds.X, bounds.Y, bounds.Width, bounds.Height, SWP_NOZORDER | SWP_SHOWWINDOW);
                     _borderlessWindows.Add(pFoundWindow.ToInt32().ToString());
                 } //today I learn the definition of a hot fix
-                
-                
+
+
                 //no more outside window
                 //    CheckNativeResult(() => Native.MoveWindow(pFoundWindow, 0, 0, bounds.Width, bounds.Height, true));
                 //resets window to main monito

Forms/CompactWindow.resx

@@ -3036,7 +3036,7 @@
         gAAR5sG2MpDgCNBt4VsV+HgOOHGM765weOOQhjQm0xEYKol2js4H29eKViTb6lMv2u+UaJ+RaJ+ZSLRz
         LtE+I8GIdw+30gVon6kHf8ervQf8+yHasRrV6pd2TpqKOs9LeDzrnHjf3hxhdsKApaNUj+3xhPvbPH4B
         3a4ddvG7mX3W5EULB01uye59V143+tVbHvrG+50MZ+UClcwsTFC588nvXv2+zU+szS0d3hfNp4S+eIAH
-        22B0LpsGXr/BOWtnGsqei/dloMF9J96HU+eBktOZ4JxccLS/KcAgLE94F3VBoL9RCfU7S3DM+IE57JXQ
+        22B0LpsGXr/BOWtnGsqei9dkoMF9J96HU+eBktOZ4JxccLS/KcAgLE94F3VBoL9RCfU7S3DM+IE57JXQ
         PpNAJiYN9X+qA+2cSbTP1AV+x/TFj8FKnBNZb8PP8Gt0A4S6AXhzJ3E8mQEYgkL3QR6L0IqxW+hiIx2N
         Fg6NXLny0FfbB09+zMltVsahZGZhEspdj7z0qx+47Ymb39E1tD2a108VngJjiW12m9GLFge6M+HAode5
         Pw8CiX4+glsW6D0XgDyOAc9diwK/1ovfVTITcbB6NAOSkZGRUSvetOK50J4kMAAO1jL7PN65l800fY60
@@ -3072,7 +3072,7 @@
         gVaG9xFXuJcnrNDfzMxCVrKSlaxkJSuNXtxYBkzDfw+BdRombLYE/a3MLGQlK1nJSlay0gzFGQYsLPUr
         xC+5l8e90N/KzEJWspKVrGQlK81SRAsDxjBMyOJN9HemlVm4msjMQlaykpWsZKWpC+UyTK3E4k0Tsg4D
         /Z1pYxbQv3MVHJl7KStZyUpWspKVpiyudQHrMEzIYEeYBM+ULfTPwYGhuabNvZSVrGQlK1nJSlMX5DRi
-        gs2Cif4/xlgEZ0If678AAAAASUVORK5CYII=
+        gs2Cif4/xlgEZ8hOtXEAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="button2.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

Properties/AssemblyInfo.cs

@@ -35,7 +35,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-
-[assembly: AssemblyVersion("4.5.0.0")]
-[assembly: AssemblyFileVersion("4.5.0.0")]
+[assembly: AssemblyVersion("5.0.0.0")]
+[assembly: AssemblyFileVersion("5.0.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]

README.md

@@ -1,10 +1,3 @@
-# Borderless-Gaming
-> "Open source light weight, portable fake fullscreen app"
-
-# Join our Steam Group!
-[Borderless Gaming on Steam](http://steamcommunity.com/groups/borderless-gaming)
-
-
 # What is this?
 Borderless Gaming is a simple tool that will allow you to turn your windowed video games into "fullscreen" applications without all of the negative side effects
 
@@ -17,25 +10,27 @@ The project is open source under the [GNU GENERAL PUBLIC LICENSE](https://github
 
 ![Image](http://i.imgur.com/kRmOysJ.jpg)
 
+
 ## How to install and run Borderless-Gaming
 
 #### Install
 
-Download the latest build from: https://github.com/Codeusa/Borderless-Gaming/releases/tag/4.3
+*Download the latest build from: https://github.com/Codeusa/Borderless-Gaming/releases/download/4.6/BorderlessGaming.zip
 
+*Extract its contents to any desired folder
 
-Extract its contents to any desired folder
-
-Run it
+*Run it
 
 #### Usage
 You can simply run the application and manually process games for borderless mode 
 
 Or you can select a game from the process list and click "add to favourites" to have it switched every time the game is run or detected as being active.
 
 #### Need help?
-contact me on my [blog](http://andrew.codeusa.net/ask)
-Feel free to contact me on my 
+contact me on my [blog](http://andrew.codeusa.net/ask) 
+
+or if you're suffering from crashes or bugs submit information [here](https://github.com/Codeusa/Borderless-Gaming/issues?state=open)
+
 
 ## Helping Borderless-Gaming 
 
@@ -49,4 +44,7 @@ Feel free to contact me on my
 
 * **Twitter:** [@CodeusaSoftware](https://twitter.com/codeusasoftware)
 * **Blog:** [andrew.codeusa.net](http://andrew.codeusa.net)
-* **Youtube:** [Youtube Channel](http://www.youtube.com/codeusasoftware)
+* **Youtube:** [Youtube Channel](http://www.youtube.com/codeusasoftware)
+
+# Join our Steam Group!
+[Borderless Gaming on Steam](http://steamcommunity.com/groups/borderless-gaming)

packages.config

@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<packages>
-  <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net40" />
-</packages>
+<packages />

version.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <borderlessgaming>
-	<version>4.6</version>
+	<version>5.0</version>
 	<url>https://github.com/Codeusa/Borderless-Gaming/releases/latest</url>
 </borderlessgaming>