MediaViewerWebBrowserDialogに軽量ビューアー版と同様のキーバインドを追加

opentween · May 1, 2018 · e255c40 · e255c40
1 parent cf624f4
commit e255c40
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 2 deletions.
diff --git a/OpenTween/MediaHandler.cs b/OpenTween/MediaHandler.cs
@@ -91,7 +91,10 @@ public void OpenMediaInWebBrowserViewer(IWin32Window owner, ThumbnailInfo[] thum
             viewer.SelectMedia(displayIndex);
 
             using (var viewerDialog = new MediaViewerWebBrowserDialog(viewer))
+            {
+                viewerDialog.OpenInBrowser = this.OpenInBrowser;
                 viewerDialog.ShowDialog(owner);
+            }
         }
     }
 }
diff --git a/OpenTween/MediaViewerWebBrowserDialog.Designer.cs b/OpenTween/MediaViewerWebBrowserDialog.Designer.cs
diff --git a/OpenTween/MediaViewerWebBrowserDialog.cs b/OpenTween/MediaViewerWebBrowserDialog.cs
@@ -20,12 +20,17 @@
 // Boston, MA 02110-1301, USA.
 
 using OpenTween.Models;
+using System;
 using System.ComponentModel;
+using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace OpenTween
 {
     public partial class MediaViewerWebBrowserDialog : OTBaseForm
     {
+        public Func<string, Task> OpenInBrowser;
+
         private readonly MediaViewerWebBrowser model;
 
         public MediaViewerWebBrowserDialog(MediaViewerWebBrowser model)
@@ -81,6 +86,36 @@ private void UpdateTitle()
         }
 
         private void UpdateHTML()
-            => this.webBrowser.DocumentText = this.model.DisplayHTML;
+        {
+            using (ControlTransaction.Update(this.webBrowser))
+                this.webBrowser.DocumentText = this.model.DisplayHTML;
+        }
+
+        private async void WebBrowser_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            e.IsInputKey = true;
+
+            switch (e.KeyData)
+            {
+                case Keys.Up:
+                case Keys.Left:
+                    this.model.SelectPreviousMedia();
+                    break;
+                case Keys.Down:
+                case Keys.Right:
+                    this.model.SelectNextMedia();
+                    break;
+                case Keys.Enter:
+                    this.Close();
+                    await this.OpenInBrowser?.Invoke(this.model.DisplayMedia.MediaPageUrl);
+                    break;
+                case Keys.Escape:
+                    this.Close();
+                    break;
+                default:
+                    e.IsInputKey = false;
+                    break;
+            }
+        }
     }
 }
diff --git a/OpenTween/Models/MediaViewerWebBrowser.cs b/OpenTween/Models/MediaViewerWebBrowser.cs
@@ -72,6 +72,24 @@ public void SelectMedia(int displayIndex)
             this.DisplayHTML = this.CreateDocument();
         }
 
+        public void SelectPreviousMedia()
+        {
+            var currentIndex = this.DisplayMediaIndex;
+            if (currentIndex == 0)
+                return;
+
+            this.SelectMedia(currentIndex - 1);
+        }
+
+        public void SelectNextMedia()
+        {
+            var currentIndex = this.DisplayMediaIndex;
+            if (currentIndex == this.MediaItems.Length - 1)
+                return;
+
+            this.SelectMedia(currentIndex + 1);
+        }
+
         public void SetBackColor(ColorRGB color)
         {
             this.BackColor = color;