レス表示領域の表示倍率を指定＋保存できるように修正

ggslyman · Apr 20, 2014 · 8f97b75 · 8f97b75
1 parent 0435149
commit 8f97b75
Show file tree

Hide file tree

Showing 8 changed files with 302 additions and 169 deletions.
diff --git a/SpeechCast/FormMain.Designer.cs b/SpeechCast/FormMain.Designer.cs
diff --git a/SpeechCast/FormMain.cs b/SpeechCast/FormMain.cs
@@ -333,9 +333,9 @@ private bool CheckBaseURL()
 #if DEBUG
         string debugDatFileName = null;
 #endif
-        // 元ソースより非同期に変更
         private int oldResCount = 0;
         private string oldUrl = "";
+        // 元ソースより非同期に変更
         private async Task<bool> GetFromURL(bool next)
         {
 
@@ -722,6 +722,8 @@ await Task.Run(() =>
                             Object[] objArray = new Object[1];
                             objArray[0] = responses[idx].Html;
                             webBrowser.Document.InvokeScript("addRes", objArray);
+                            objArray[0] = UserConfig.magnification;
+                            webBrowser.Document.InvokeScript("setZoom", objArray);
                         }
                     }                    
                 }
@@ -1887,33 +1889,29 @@ private void toolStripButtonPlaySoundNewResponse_Click(object sender, EventArgs
 
         private void toolStripStatusLabelCommunication_Click(object sender, EventArgs e)
         {
-            if (this.splitContainerResCaption.Panel2.Height > 0)
-            {
-                this.splitContainerResCaption.SplitterDistance = 2000;
-                this.splitContainerResCaption.IsSplitterFixed = true;
-                this.webBrowser.Focus();
-            }
-            else
-            {
-                this.splitContainerResCaption.SplitterDistance = this.splitContainerResCaption.Height - 130;
-                this.splitContainerResCaption.IsSplitterFixed = false;
-            }
+            this.openResCaptionForm();
         }
         private void toolStripStatusLabelDefaultCaptionButton_Click(object sender, EventArgs e)
+        {
+            this.openResCaptionForm();
+        }
+
+        private void openResCaptionForm()
         {
             if (this.splitContainerResCaption.Panel2.Height > 0)
             {
-                this.splitContainerResCaption.SplitterDistance = 2000;
+                int resCaptionFormHeight = this.splitContainerResCaption.SplitterDistance;
+                this.splitContainerResCaption.SplitterDistance = 4000;
                 this.splitContainerResCaption.IsSplitterFixed = true;
                 this.webBrowser.Focus();
             }
             else
             {
                 this.splitContainerResCaption.SplitterDistance = this.splitContainerResCaption.Height - 130;
                 this.splitContainerResCaption.IsSplitterFixed = false;
+                webBrowser.Document.Window.ScrollTo(0, (webBrowser.Document.Body.ScrollTop + this.splitContainerResCaption.Panel2.Height));
             }
         }
-
         private void toolStripButtonCaptionAutoSmall_Click(object sender, EventArgs e)
         {
             UserConfig.CaptionAutoSmall = this.toolStripButtonCaptionAutoSmall.Checked;
@@ -2250,5 +2248,21 @@ private void viewResList(bool visibleFlag)
             }
 
         }
+
+        private void toolStripButtonZoomOutnResView_Click(object sender, EventArgs e)
+        {
+            Object[] objArray = new Object[1];
+            UserConfig.magnification = UserConfig.magnification - 0.1;
+            objArray[0] = UserConfig.magnification;
+            webBrowser.Document.InvokeScript("setZoom", objArray);
+        }
+
+        private void toolStripButtonZoomInnResView_Click(object sender, EventArgs e)
+        {
+            Object[] objArray = new Object[1];
+            UserConfig.magnification = UserConfig.magnification + 0.1;
+            objArray[0] = UserConfig.magnification;
+            webBrowser.Document.InvokeScript("setZoom", objArray);
+        }
     }
 }
diff --git a/SpeechCast/FormMain.resx b/SpeechCast/FormMain.resx
diff --git a/SpeechCast/Properties/AssemblyInfo.cs b/SpeechCast/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.1.17")]
-[assembly: AssemblyFileVersion("2.0.1.17")]
+[assembly: AssemblyVersion("2.0.1.18")]
+[assembly: AssemblyFileVersion("2.0.1.18")]
diff --git a/SpeechCast/Resources/resView.html b/SpeechCast/Resources/resView.html
@@ -1,18 +1,27 @@
 <html>
 	<body>
 		<script type="text/javascript">
-		function addRes(res) {
-			var element = document.createElement('div');
-			element.innerHTML = res;
-			var objResArea = document.getElementById("resArea");;
-			objResArea.appendChild(element);
-		}
-		function clearRes() {
-			var objResArea = document.getElementById("resArea");
-			objResArea.innerHTML = "";
-		}
-		</script>
-		<div id="resArea">
+      function addRes(res) {
+      var element = document.createElement('div');
+      element.innerHTML = res;
+      var objResArea = document.getElementById("resArea");;
+      objResArea.appendChild(element);
+      }
+      function clearRes() {
+      var objResArea = document.getElementById("resArea");
+      objResArea.innerHTML = "";
+      }
+      function setZoom(magnification){
+      var objResArea = document.getElementById("resArea");
+
+      if ('zoom' in objResArea.style) {
+      objResArea.style.zoom = magnification;
+      } else {
+      alert ("Your browser doesn't support this example!");
+      }
+      }
+    </script>
+		<div id="resArea" style="zoom:100%">
 		</div>
 	</body>
 </html>
diff --git a/SpeechCast/Resources/zoom-in.png b/SpeechCast/Resources/zoom-in.png
diff --git a/SpeechCast/Resources/zoom-out.png b/SpeechCast/Resources/zoom-out.png
diff --git a/SpeechCast/UseConfig.cs b/SpeechCast/UseConfig.cs
@@ -239,6 +239,11 @@ public void SupplementSettings()
         /// </summary>
         public bool AutoOpenNextThread = false;
 
+        /// <summary>
+        /// レス表示領域の表示倍率
+        /// </summary>
+        public double magnification = 1.0;
+
         /// <summary>
         /// 文字数制限
         /// </summary>