From: ttp <ttp@users.sourceforge.jp>
Date: Sat, 4 Dec 2010 03:39:18 +0000 (+0900)
Subject: Merge branch 'master' of git.sourceforge.jp:/gitroot/applistation/AppliStation
X-Git-Tag: v1.3.7~6
X-Git-Url: http://git.sourceforge.jp/view?p=applistation%2FAppliStation.git;a=commitdiff_plain;h=d9df5f704d91251ff9acbe09c30d6dec011b876c;hp=2385ae60f7ec63b4168e0bac30a50c0d1f4e9f28

Merge branch 'master' of git.sourceforge.jp:/gitroot/applistation/AppliStation
---

diff --git a/AppliStation/AppliStation.Util/ExecutionProgressViewer.Designer.cs b/AppliStation/AppliStation.Util/ExecutionProgressViewer.Designer.cs
index 4946a84..0296c7b 100644
--- a/AppliStation/AppliStation.Util/ExecutionProgressViewer.Designer.cs
+++ b/AppliStation/AppliStation.Util/ExecutionProgressViewer.Designer.cs
@@ -168,6 +168,7 @@ namespace AppliStation.Util
 			this.logBox.DetectUrls = false;
 			this.logBox.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.logBox.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.logBox.Layout += new System.Windows.Forms.LayoutEventHandler(this.LogBoxTextLayouted);
 			this.logBox.Location = new System.Drawing.Point(3, 121);
 			this.logBox.Name = "logBox";
 			this.logBox.ReadOnly = true;
diff --git a/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs b/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs
index 4a746af..a9f5f78 100644
--- a/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs
+++ b/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs
@@ -245,6 +245,11 @@ namespace AppliStation.Util
 			logBox.ScrollToCaret();
 		}
 		
+		void LogBoxTextLayouted(object sender, LayoutEventArgs e)
+		{
+			logBox.ScrollToCaret();
+		}
+		
 		void OkButtonClick(object sender, EventArgs e)
 		{
 			if (taskSet == null || taskSet.Done) {