From 01fdca8ebf620c1a4ce4654a8defc60b839f6898 Mon Sep 17 00:00:00 2001
From: Jared Goodwin <translucency@outlook.com>
Date: Fri, 12 Apr 2019 20:14:36 -0700
Subject: [PATCH] Minor cleanup and refactoring.

---
 .../Capture/ImageUtils.cs                     |  7 +-----
 .../Capture/ScreenCaster.cs                   | 23 -------------------
 Remotely_Server/CurrentVersion.txt            |  2 +-
 Remotely_Server/Pages/About.cshtml            |  2 +-
 Remotely_Server/Pages/Clients.cshtml          | 12 +++++-----
 Remotely_Server/wwwroot/css/site.css          |  4 ++++
 6 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/Remotely_ScreenCast.Core/Capture/ImageUtils.cs b/Remotely_ScreenCast.Core/Capture/ImageUtils.cs
index bb9e6de6..bc70a66f 100644
--- a/Remotely_ScreenCast.Core/Capture/ImageUtils.cs
+++ b/Remotely_ScreenCast.Core/Capture/ImageUtils.cs
@@ -99,12 +99,7 @@ namespace Remotely_ScreenCast.Core.Capture
 
                 if (left < right && top < bottom)
                 {
-                    // Bounding box is valid.
-
-                    left = Math.Max(left - 20, 0);
-                    top = Math.Max(top - 20, 0);
-                    right = Math.Min(right + 20, width);
-                    bottom = Math.Min(bottom + 20, height);
+                    // Bounding box is valid
 
                     return new Rectangle(left, top, right - left, bottom - top);
                 }
diff --git a/Remotely_ScreenCast.Core/Capture/ScreenCaster.cs b/Remotely_ScreenCast.Core/Capture/ScreenCaster.cs
index 08091f2d..b4c63152 100644
--- a/Remotely_ScreenCast.Core/Capture/ScreenCaster.cs
+++ b/Remotely_ScreenCast.Core/Capture/ScreenCaster.cs
@@ -96,29 +96,6 @@ namespace Remotely_ScreenCast.Core.Capture
                             capturer.CaptureFullscreen = false;
                         }
                         
-                        //long newQuality;
-                        //if (viewer.PendingFrames < 8)
-                        //{
-                        //    newQuality = Math.Min(1, viewer.ImageQuality + 1);
-                        //}
-                        //else
-                        //{
-                        //    newQuality = Math.Max(0, viewer.ImageQuality - 1);
-                        //}
-
-                        //if (newQuality != viewer.ImageQuality)
-                        //{
-                        //    Logger.Write($"New quality: {newQuality}");
-                        //    viewer.ImageQuality = newQuality;
-                        //    viewer.FullScreenRefreshNeeded = true;
-                        //}
-                        //else if (viewer.FullScreenRefreshNeeded)
-                        //{
-                        //    Logger.Write($"Quality stabilized.");
-                        //    capturer.CaptureFullscreen = true;
-                        //    viewer.FullScreenRefreshNeeded = false;
-                        //}
-
                         encodedImageBytes = ImageUtils.EncodeBitmap(newImage, viewer.EncoderParams);
 
                         if (encodedImageBytes?.Length > 0)
diff --git a/Remotely_Server/CurrentVersion.txt b/Remotely_Server/CurrentVersion.txt
index 9bb9fc60..d859acee 100644
--- a/Remotely_Server/CurrentVersion.txt
+++ b/Remotely_Server/CurrentVersion.txt
@@ -1 +1 @@
-2019.04.10.1704
+2019.04.12.0814
diff --git a/Remotely_Server/Pages/About.cshtml b/Remotely_Server/Pages/About.cshtml
index 304e70c0..602d2e22 100644
--- a/Remotely_Server/Pages/About.cshtml
+++ b/Remotely_Server/Pages/About.cshtml
@@ -18,5 +18,5 @@
     Open-Source Licenses: <a asp-page="/Credits">@Request.Scheme://@Request.Host/Credits</a>
 </p>
 <p>
-    Version: @System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString()
+    Version: @System.Diagnostics.FileVersionInfo.GetVersionInfo("Remotely_Server.dll").FileVersion.ToString()
 </p>
diff --git a/Remotely_Server/Pages/Clients.cshtml b/Remotely_Server/Pages/Clients.cshtml
index 00424bd0..527dd528 100644
--- a/Remotely_Server/Pages/Clients.cshtml
+++ b/Remotely_Server/Pages/Clients.cshtml
@@ -36,7 +36,7 @@
         Instant desktop sharing with no installation or hassles.
     </div>
     <div class="col-sm-6">
-        <h6 class="font-weight-bold">Windows</h6 class="font-weight-bold">
+        <h6 class="font-weight-bold">Windows</h6>
         <p>
             <strong>Download:</strong>
             <br />
@@ -44,7 +44,7 @@
         </p>
     </div>
     @*<div class="col-sm-6">
-        <h6 class="font-weight-bold">Windows 32-Bit</h6 class="font-weight-bold">
+        <h6 class="font-weight-bold">Windows 32-Bit</h6>
         <p>
             <strong>Download:</strong>
             <br />
@@ -61,7 +61,7 @@
     @if (User.Identity.IsAuthenticated)
     {
     <div class="col-sm-6">
-        <h6 class="font-weight-bold">Windows 10 64-Bit</h6 class="font-weight-bold">
+        <h6 class="font-weight-bold">Windows 10 64-Bit</h6>
         <p>
             <strong>Download:</strong>
             <br />
@@ -89,7 +89,7 @@
     </div>
 
     <div class="col-sm-6 ">
-        <h6 class="font-weight-bold">Windows 10 32-Bit</h6 class="font-weight-bold">
+        <h6 class="font-weight-bold">Windows 10 32-Bit</h6>
         <p>
             <strong>Download:</strong>
             <br />
@@ -115,7 +115,7 @@
         </p>
     </div>
     <div class="col-sm-6 ">
-        <h6 class="font-weight-bold">Linux 64-Bit</h6 class="font-weight-bold">
+        <h6 class="font-weight-bold">Linux 64-Bit</h6>
         <p>
             <strong>Download:</strong>
             <br />
@@ -144,7 +144,7 @@
     else
     {
         <div class="col-sm-6 ">
-            <h6 class="font-weight-bold">Resident clients are available after logging in.</h6 class="font-weight-bold">
+            <h6 class="font-weight-bold">Resident clients are available after logging in.</h6>
         </div>
 
     }
diff --git a/Remotely_Server/wwwroot/css/site.css b/Remotely_Server/wwwroot/css/site.css
index 784a7a9e..8977b602 100644
--- a/Remotely_Server/wwwroot/css/site.css
+++ b/Remotely_Server/wwwroot/css/site.css
@@ -15,6 +15,10 @@ a.navbar-brand {
     margin: 15px;
 }
 
+h6 {
+    font-size: 1rem !important;
+}
+
 
 .logo-subtitle {
     font-size: .5em;