MediaViewerWebBrowserで表示中の画像のインデックスを持たせる

Author: upsilon

OpenTween/MediaHandler.cs

@@ -87,7 +87,8 @@ public async Task OpenMediaInLightViewer(IWin32Window owner, ThumbnailInfo[] thu
         public void OpenMediaInWebBrowserViewer(IWin32Window owner, ThumbnailInfo[] thumbnails, int displayIndex)
         {
             var viewer = new MediaViewerWebBrowser();
-            viewer.SetMediaItem(thumbnails[displayIndex]);
+            viewer.SetMediaItems(thumbnails);
+            viewer.SelectMedia(displayIndex);
 
             using (var viewerDialog = new MediaViewerWebBrowserDialog(viewer))
                 viewerDialog.ShowDialog(owner);

OpenTween/MediaViewerWebBrowserDialog.cs

@@ -45,6 +45,10 @@ private void Model_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             switch (e.PropertyName)
             {
+                case nameof(MediaViewerWebBrowser.MediaItems):
+                case nameof(MediaViewerWebBrowser.DisplayMediaIndex):
+                    this.UpdateTitle();
+                    break;
                 case nameof(MediaViewerWebBrowser.DisplayHTML):
                     this.UpdateHTML();
                     break;
@@ -59,9 +63,23 @@ private void Model_PropertyChanged(object sender, PropertyChangedEventArgs e)
 
         private void UpdateAll()
         {
+            this.UpdateTitle();
             this.UpdateHTML();
         }
 
+        private void UpdateTitle()
+        {
+            const string TITLE_TEMPLATE = "{0}/{1}";
+
+            var mediaCount = this.model.MediaItems.Length;
+            var displayIndex = this.model.DisplayMediaIndex;
+
+            if (mediaCount == 1)
+                this.Text = "";
+            else
+                this.Text = string.Format(TITLE_TEMPLATE, displayIndex + 1, mediaCount);
+        }
+
         private void UpdateHTML()
             => this.webBrowser.DocumentText = this.model.DisplayHTML;
     }

OpenTween/Models/MediaViewerWebBrowser.cs

@@ -27,12 +27,22 @@ namespace OpenTween.Models
 {
     public class MediaViewerWebBrowser : NotifyPropertyChangedBase
     {
-        public ThumbnailInfo DisplayMedia
+        public ThumbnailInfo[] MediaItems
         {
-            get => this._displayMedia;
-            private set => this.SetProperty(ref this._displayMedia, value);
+            get => this._mediaItems;
+            private set => this.SetProperty(ref this._mediaItems, value);
         }
-        private ThumbnailInfo _displayMedia;
+        private ThumbnailInfo[] _mediaItems = new ThumbnailInfo[0];
+
+        public int DisplayMediaIndex
+        {
+            get => this._displayMediaIndex;
+            private set => this.SetProperty(ref this._displayMediaIndex, value);
+        }
+        private int _displayMediaIndex;
+
+        public ThumbnailInfo DisplayMedia
+            => this.MediaItems[this.DisplayMediaIndex];
 
         public string DisplayHTML
         {
@@ -48,9 +58,17 @@ public ColorRGB BackColor
         }
         private ColorRGB _backColor = new ColorRGB(0, 0, 0);
 
-        public void SetMediaItem(ThumbnailInfo media)
+        public void SetMediaItems(ThumbnailInfo[] thumbnails)
         {
-            this.DisplayMedia = media;
+            this.DisplayMediaIndex = 0;
+            this.MediaItems = thumbnails;
+        }
+
+        public void SelectMedia(int displayIndex)
+        {
+            this.DisplayMediaIndex = displayIndex;
+
+            var media = this.MediaItems[displayIndex];
             this.DisplayHTML = this.CreateDocument();
         }