From 716fe604b1bbef69c62d1bda5ebd1516fa3ff236 Mon Sep 17 00:00:00 2001
From: anis774 <anis774@users.sourceforge.jp>
Date: Fri, 31 Dec 2010 23:24:34 +0000
Subject: [PATCH] =?utf8?q?=E3=82=BF=E3=83=96=E5=89=8A=E9=99=A4=E6=99=82?=
 =?utf8?q?=E3=81=AB=E5=89=8D=E5=9B=9E=E3=81=AE=E3=82=BF=E3=83=96=E3=82=92?=
 =?utf8?q?=E9=81=B8=E6=8A=9E=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?utf8?q?=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@1298 e39ad16e-3079-482e-bb30-4b4d378143b6
---
 Tween/StatusDictionary.vb |  3 ---
 Tween/Tween.vb            | 20 ++++++--------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/Tween/StatusDictionary.vb b/Tween/StatusDictionary.vb
index 08fc72f0..69b37dea 100644
--- a/Tween/StatusDictionary.vb
+++ b/Tween/StatusDictionary.vb
@@ -1637,9 +1637,6 @@ Public NotInheritable Class TabClass
 #End Region
 
     <Xml.Serialization.XmlIgnore()> _
-    Public Property BackToTab() As TabClass
-
-    <Xml.Serialization.XmlIgnore()> _
     Public Property RelationTargetPost() As PostClass
 
     <Xml.Serialization.XmlIgnore()> _
diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index 224c7236..9e477290 100644
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -57,6 +57,7 @@ Public Class TweenMain
     Private _initialLayout As Boolean = True
     Private _ignoreConfigSave As Boolean         'True:起動時処理中
     Private _tabDrag As Boolean           'タブドラッグ中フラグ（DoDragDropを実行するかの判定用）
+    Private _beforeSelectedTab As TabPage 'タブが削除されたときに前回選択されていたときのタブを選択する為に保持
     Private _tabMouseDownPoint As Point
     Private _rclickTabName As String      '右クリックしたタブの名前（Tabコントロール機能不足対応）
     Private ReadOnly _syncObject As New Object()    'ロック用
@@ -3643,6 +3644,9 @@ Public Class TweenMain
 
         _tabPage.SuspendLayout()
 
+        If Me.ListTab.SelectedTab Is Me.ListTab.TabPages(idx) Then
+            Me.ListTab.SelectedTab = If(Me._beforeSelectedTab, Me.ListTab.TabPages(0))
+        End If
         Me.ListTab.Controls.Remove(_tabPage)
 
         Dim pnl As Control = Nothing
@@ -3714,6 +3718,7 @@ Public Class TweenMain
                 lst.VirtualListSize = _statuses.Tabs(tp.Text).AllCount
             End If
         Next
+
         Return True
     End Function
 
@@ -3721,6 +3726,7 @@ Public Class TweenMain
         _itemCache = Nothing
         _itemCacheIndex = -1
         _postCache = Nothing
+        _beforeSelectedTab = e.TabPage
     End Sub
 
     Private Sub ListTab_MouseMove(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles ListTab.MouseMove
@@ -4901,19 +4907,6 @@ RETRY:
             ElseIf e.KeyCode = Keys.Escape Then
                 If ListTab.SelectedTab IsNot Nothing AndAlso _statuses.Tabs(ListTab.SelectedTab.Text).TabType = TabUsageType.Related Then
                     Dim relTp As TabPage = ListTab.SelectedTab
-                    Dim backToTab As TabClass = _statuses.Tabs(relTp.Text).BackToTab
-                    If backToTab IsNot Nothing Then
-                        Try
-                            For Each tp As TabPage In ListTab.TabPages
-                                If tp.Text = backToTab.TabName Then
-                                    ListTab.SelectTab(tp)
-                                    Exit For
-                                End If
-                            Next
-                        Catch ex As Exception
-
-                        End Try
-                    End If
                     RemoveSpecifiedTab(relTp.Text, False)
                     SaveConfigsTabs()
                 End If
@@ -10075,7 +10068,6 @@ RETRY:
 
             Dim tb As TabClass = _statuses.GetTabByType(TabUsageType.Related)
             tb.RelationTargetPost = _curPost
-            tb.BackToTab = backToTab
             Me.ClearTab(tb.TabName, False)
             For i As Integer = 0 To ListTab.TabPages.Count - 1
                 If tb.TabName = ListTab.TabPages(i).Text Then
-- 
2.11.0