Changeset 24566

Timestamp:

11/21/08 18:43:14 (7 weeks ago)

Author:

kiri_feather

Message:

configに変な値が入る場合があるための対策を一部

Location:

lang/vb2005/Tween/Tween

Files:

• TwConfig.vb (modified) (3 diffs)
• Tween.vb (modified) (1 diff)

lang/vb2005/Tween/Tween/TwConfig.vb

@@ -889 +889 @@
     Public Property SplitterDistance() As Integer
         Get
-            Return CInt(Me("splitterdistance"))
-        End Get
-        Set(ByVal value As Integer)
+            Dim dis As Integer = DirectCast(Me("splitterdistance"), Integer)
+            If dis < 0 Then dis = 320
+            Return dis
+        End Get
+        Set(ByVal value As Integer)
+            If value < 0 Then value = 320
             Me("splitterdistance") = value
         End Set
@@ -899 +902 @@
     Public Property FormSize() As Size
         Get
-            Return CType(Me("formsize"), Size)
+            Dim sz As Size = CType(Me("formsize"), Size)
+            If sz.Height < 0 Then sz.Height = 476
+            If sz.Width < 0 Then sz.Width = 436
+            Return sz
         End Get
         Set(ByVal value As Size)
-            Me("formsize") = value
+            Dim sz As Size = value
+            If sz.Height < 0 Then sz.Height = 476
+            If sz.Width < 0 Then sz.Width = 436
+            Me("formsize") = sz
         End Set
     End Property
@@ -1551 +1560 @@
             If pwd.Length > 0 Then
                 Try
-                    Me("proxypassword") = EncryptString(value)
+                    Me("proxypassword") = EncryptString(pwd)
                 Catch ex As Exception
                     Me("proxypassword") = ""

lang/vb2005/Tween/Tween/Tween.vb

@@ -7030 +7030 @@
 
     Private Sub SplitContainer1_SplitterMoved(ByVal sender As Object, ByVal e As System.Windows.Forms.SplitterEventArgs) Handles SplitContainer1.SplitterMoved
-        _mySpDis = SplitContainer1.SplitterDistance
+        If Me.WindowState = FormWindowState.Normal Then _mySpDis = SplitContainer1.SplitterDistance
     End Sub