From 8ef78986ebc1cfb23fd4e5db7d68ac263ca9277b Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Sun, 13 Jan 2013 03:30:48 +0900
Subject: [PATCH] =?utf8?q?PictureBox.Visible=20=E3=81=AE=E5=80=A4=E3=81=AE?=
 =?utf8?q?=E5=A4=89=E6=9B=B4=E3=81=AB=E4=BD=95=E6=95=85=E3=81=8B=E6=99=82?=
 =?utf8?q?=E9=96=93=E3=81=AE=E6=8E=9B=E3=81=8B=E3=82=8B=E5=95=8F=E9=A1=8C?=
 =?utf8?q?=E3=81=AE=E5=9B=9E=E9=81=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 OpenTween.Tests/TweetThumbnailTest.cs |  3 ++-
 OpenTween/TweetThumbnail.cs           | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/OpenTween.Tests/TweetThumbnailTest.cs b/OpenTween.Tests/TweetThumbnailTest.cs
index 2bf7033f..5944bb1a 100644
--- a/OpenTween.Tests/TweetThumbnailTest.cs
+++ b/OpenTween.Tests/TweetThumbnailTest.cs
@@ -84,7 +84,6 @@ namespace OpenTween
                 Assert.That(picbox.SizeMode, Is.EqualTo(PictureBoxSizeMode.Zoom));
                 Assert.That(picbox.WaitOnLoad, Is.False);
                 Assert.That(picbox.Dock, Is.EqualTo(DockStyle.Fill));
-                Assert.That(picbox.Visible, Is.False);
 
                 picbox.Dispose();
             }
@@ -124,6 +123,8 @@ namespace OpenTween
                     num++;
                 }
 
+                Assert.That(thumbbox.Controls, Is.EquivalentTo(new Control[]{ thumbbox.scrollBar }.Concat(thumbbox.pictureBox)));
+
                 Assert.That(thumbbox.scrollBar.Minimum, Is.EqualTo(0));
                 Assert.That(thumbbox.scrollBar.Maximum, Is.EqualTo(count));
             }
diff --git a/OpenTween/TweetThumbnail.cs b/OpenTween/TweetThumbnail.cs
index 46099076..5a008c4c 100644
--- a/OpenTween/TweetThumbnail.cs
+++ b/OpenTween/TweetThumbnail.cs
@@ -89,7 +89,6 @@ namespace OpenTween
                             cancelToken.ThrowIfCancellationRequested();
                         }
 
-                        this.pictureBox[0].Visible = true;
                         this.scrollBar.Maximum = thumbnails.Count - 1;
 
                         if (thumbnails.Count > 1)
@@ -147,6 +146,7 @@ namespace OpenTween
             for (int i = 0; i < count; i++)
             {
                 var picbox = CreatePictureBox("pictureBox" + i);
+                picbox.Visible = (i == 0);
                 picbox.DoubleClick += this.pictureBox_DoubleClick;
 
                 this.Controls.Add(picbox);
@@ -164,7 +164,6 @@ namespace OpenTween
                 SizeMode = PictureBoxSizeMode.Zoom,
                 WaitOnLoad = false,
                 Dock = DockStyle.Fill,
-                Visible = false,
             };
         }
 
@@ -190,15 +189,29 @@ namespace OpenTween
 
         private void scrollBar_ValueChanged(object sender, EventArgs e)
         {
+            this.SuspendLayout();
             for (var i = 0; i < this.pictureBox.Count; i++)
             {
                 var picbox = this.pictureBox[i];
+                Console.WriteLine(this.scrollBar.Value + ", " + i);
 
                 if (this.scrollBar.Value == i)
                     picbox.Visible = true;
                 else
                     picbox.Visible = false;
             }
+            this.ResumeLayout(false);
+        }
+
+        private void ShowPictureBox(int index)
+        {
+            foreach (Control control in this.Controls)
+            {
+                if (control is PictureBox)
+                    this.Controls.Remove(control);
+            }
+
+            this.Controls.Add(this.pictureBox[index]);
         }
 
         private void pictureBox_DoubleClick(object sender, EventArgs e)
-- 
2.11.0