バグ修正: 同じ高さの採番順

近接幅が0倍の時、同じ高さの図形の採番順が選択順になってしまうバグの修正をしました。
ta-kon · May 9, 2018 · ac07380 · ac07380
1 parent f9ac701
commit ac07380
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 /source/test/
+/source/連番太郎_自動ロード.xlsm
diff --git a/Numbering-ExcelAddin.xlam b/Numbering-ExcelAddin.xlam
diff --git a/source/Controller.bas b/source/Controller.bas
@@ -432,7 +432,7 @@ End Function
 
 Private Function isCollision(ByVal left As Long, ByVal right As Long, ByVal collision As Double) As Boolean
   ' 幅を考慮した数値の比較
-  isCollision = (Abs(left - right) < collision)
+  isCollision = (Abs(left - right) <= collision)
 End Function
 
 Private Function isDescLocation(ByVal left As Long, ByVal right As Long) As Boolean

diff --git a/source/View.bas b/source/View.bas
@@ -148,7 +148,7 @@ Sub onCollisionTextChange(ByRef control As IRibbonControl, ByRef text As String)
       strDbl = Replace(strDbl, "倍", "")
       strDbl = Trim(strDbl)
       If IsNumeric(strDbl) Then
-        COLLISION = CDbl(strDbl)
+        COLLISION = Abs(CDbl(strDbl))
       Else
         Dim message As String
         message = "数値を入力してください。(単位: 倍), 現在の値=" & text