From 9bab981e12760d0f915786fc6523284cc32e557c Mon Sep 17 00:00:00 2001
From: syo68k <syo68k@users.sourceforge.jp>
Date: Fri, 21 Jan 2011 16:52:14 +0000
Subject: [PATCH] =?utf8?q?TreeView=E3=81=AE=E3=82=AF=E3=83=AA=E3=83=83?=
 =?utf8?q?=E3=82=AF=E6=99=82=E3=81=AE=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92?=
 =?utf8?q?=E6=9B=B8=E3=81=8D=E7=9B=B4=E3=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@1396 e39ad16e-3079-482e-bb30-4b4d378143b6
---
 Tween/AppendSettingDialog.vb | 102 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 76 insertions(+), 26 deletions(-)

diff --git a/Tween/AppendSettingDialog.vb b/Tween/AppendSettingDialog.vb
index 9f571993..0e4da4b6 100644
--- a/Tween/AppendSettingDialog.vb
+++ b/Tween/AppendSettingDialog.vb
@@ -140,41 +140,90 @@ Public Class AppendSettingDialog
     Private _soundfileListup As Boolean = False
     Private _MyEventSoundFile As String
 
-    Private Sub TreeView1_BeforeSelect(ByVal sender As Object, ByVal e As System.Windows.Forms.TreeViewCancelEventArgs) Handles TreeView1.BeforeSelect
-        If _curPanel IsNot Nothing Then Exit Sub
-        If Me.TreeView1.SelectedNode Is Nothing Then Exit Sub
-        Dim pnl = DirectCast(Me.TreeView1.SelectedNode.Tag, Panel)
-        If pnl Is Nothing Then Exit Sub
-        pnl.Enabled = False
-        pnl.Visible = False
-    End Sub
 
-    Private Sub TreeView1_AfterSelect(ByVal sender As System.Object, ByVal e As System.Windows.Forms.TreeViewEventArgs) Handles TreeView1.AfterSelect
-        If e.Node Is Nothing Then Exit Sub
-        Dim pnl = DirectCast(e.Node.Tag, Panel)
+    Private Sub TreeView1_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles TreeView1.MouseDown
+        Dim Node As TreeNode = TreeView1.GetNodeAt(e.X, e.Y)
+        If Node Is Nothing Then Exit Sub
+        Dim pnl = DirectCast(Node.Tag, Panel)
         If pnl Is Nothing Then Exit Sub
         If _curPanel IsNot Nothing Then
-            If pnl.Name = _curPanel.Name Then Exit Sub
-            _curPanel.Enabled = False
-            _curPanel.Visible = False
-            _curPanel = Nothing
+            If pnl.Name <> _curPanel.Name Then
+                _curPanel.Enabled = False
+                _curPanel.Visible = False
+                _curPanel = Nothing
+            End If
         End If
-        If FirstExpandNode Then
-            FirstExpandNode = False
+
+        If Node.IsExpanded Then
+            Node.Collapse()
         Else
-            e.Node.Expand()
+            Node.Expand()
+        End If
+        If _curPanel Is Nothing Then
             _curPanel = pnl
-            TreeView1.SelectedNode = Nothing
+            pnl.Enabled = True
+            pnl.Visible = True
         End If
-        pnl.Enabled = True
-        pnl.Visible = True
     End Sub
 
-    Private Sub TreeView1_KeyDown(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) Handles TreeView1.KeyDown
-        If e.KeyCode = Keys.Down OrElse e.KeyCode = Keys.Up OrElse e.KeyCode = Keys.Left OrElse e.KeyCode = Keys.Right Then
-            FirstExpandNode = True
-        End If
-    End Sub
+    'Private Sub TreeView1_BeforeSelect(ByVal sender As Object, ByVal e As System.Windows.Forms.TreeViewCancelEventArgs) Handles TreeView1.BeforeSelect
+    '    If e.Node Is Nothing Then Exit Sub
+    '    Dim pnl = DirectCast(e.Node.Tag, Panel)
+    '    If pnl Is Nothing Then Exit Sub
+    '    If _curPanel IsNot Nothing Then
+    '        If pnl.Name = _curPanel.Name Then Exit Sub
+    '        _curPanel.Enabled = False
+    '        _curPanel.Visible = False
+    '        _curPanel = Nothing
+    '    End If
+    '    If e.Action = TreeViewAction.ByMouse Then
+    '        If e.Node.IsExpanded Then
+    '            e.Node.Collapse()
+    '        Else
+    '            e.Node.Expand()
+    '        End If
+    '        TreeView1.SelectedNode = Nothing
+    '    End If
+    '    _curPanel = pnl
+    '    pnl.Enabled = True
+    '    pnl.Visible = True
+    'End Sub
+
+    'Private Sub TreeView1_BeforeSelect(ByVal sender As Object, ByVal e As System.Windows.Forms.TreeViewCancelEventArgs) Handles TreeView1.BeforeSelect
+    '    If _curPanel IsNot Nothing Then Exit Sub
+    '    If Me.TreeView1.SelectedNode Is Nothing Then Exit Sub
+    '    Dim pnl = DirectCast(Me.TreeView1.SelectedNode.Tag, Panel)
+    '    If pnl Is Nothing Then Exit Sub
+    '    pnl.Enabled = False
+    '    pnl.Visible = False
+    'End Sub
+
+    'Private Sub TreeView1_AfterSelect(ByVal sender As System.Object, ByVal e As System.Windows.Forms.TreeViewEventArgs) Handles TreeView1.AfterSelect
+    '    If e.Node Is Nothing Then Exit Sub
+    '    Dim pnl = DirectCast(e.Node.Tag, Panel)
+    '    If pnl Is Nothing Then Exit Sub
+    '    If _curPanel IsNot Nothing Then
+    '        If pnl.Name = _curPanel.Name Then Exit Sub
+    '        _curPanel.Enabled = False
+    '        _curPanel.Visible = False
+    '        _curPanel = Nothing
+    '    End If
+    '    If FirstExpandNode Then
+    '        FirstExpandNode = False
+    '    Else
+    '        e.Node.Expand()
+    '        _curPanel = pnl
+    '        TreeView1.SelectedNode = Nothing
+    '    End If
+    '    pnl.Enabled = True
+    '    pnl.Visible = True
+    'End Sub
+
+    'Private Sub TreeView1_KeyDown(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) Handles TreeView1.KeyDown
+    '    If e.KeyCode = Keys.Down OrElse e.KeyCode = Keys.Up OrElse e.KeyCode = Keys.Left OrElse e.KeyCode = Keys.Right Then
+    '        FirstExpandNode = True
+    '    End If
+    'End Sub
 
     Private Sub Save_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Save.Click
         If TweenMain.IsNetworkAvailable() AndAlso _
@@ -2559,4 +2608,5 @@ Public Class AppendSettingDialog
 
         _MyEventSoundFile = DirectCast(ComboBoxEventNotifySound.SelectedItem, String)
     End Sub
+
 End Class
\ No newline at end of file
-- 
2.11.0