From 10dfb9dd9f44538c98ecf8e7edd3afb57a59f5c5 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Sun, 8 Apr 2012 21:11:31 +0900
Subject: [PATCH] =?utf8?q?=E3=81=84=E3=81=8F=E3=81=A4=E3=81=8B=E3=81=AE?=
 =?utf8?q?=E3=82=B7=E3=83=A7=E3=83=BC=E3=83=88=E3=82=AB=E3=83=83=E3=83=88?=
 =?utf8?q?=E3=82=AD=E3=83=BC=E3=81=8C=E6=AD=A3=E5=B8=B8=E3=81=AB=E5=8B=95?=
 =?utf8?q?=E4=BD=9C=E3=81=97=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92?=
 =?utf8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 OpenTween/Resources/ChangeLog.txt |  2 +-
 OpenTween/Tween.cs                | 32 +++++++++++++++-----------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/OpenTween/Resources/ChangeLog.txt b/OpenTween/Resources/ChangeLog.txt
index c9e6ff4a..2bba1e6d 100644
--- a/OpenTween/Resources/ChangeLog.txt
+++ b/OpenTween/Resources/ChangeLog.txt
@@ -2,7 +2,7 @@
 
 ==== Ver 1.0.1-beta1(2012/xx/xx)
  * FIX: OpenTweenアイコンが表示方法によって低解像度で表示されてしまう問題を修正
- * FIX: リスト表示上のショートカットキー「h」「l」が動作しない問題を修正
+ * FIX: リスト表示上での一部のショートカットキーが動作しない問題を修正
  * FIX: 「常に最前面に表示」が有効な状態でバージョン情報ダイアログを表示できない問題を修正
  * FIX: 「最小化したときにアイコン化する」が強制的にオンになる問題を修正
  * FIX: 発言詳細部においてUnicodeで追加された一部の文字が正しく表示されない問題を修正
diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 11c68d66..23db9104 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -5614,7 +5614,7 @@ namespace OpenTween
             {
                 cidx = _curList.SelectedIndices[0];
             }
-            toIdx = _curList.VirtualListSize - 1;
+            toIdx = _curList.VirtualListSize;
 
             switch (SType)
             {
@@ -5645,7 +5645,7 @@ namespace OpenTween
                     {
                         cidx = toIdx;
                     }
-                    toIdx = 0;
+                    toIdx = -1;
                     stp = -1;
                     break;
             }
@@ -5667,7 +5667,7 @@ namespace OpenTween
                     try
                     {
                         _search = new Regex(_word, regOpt);
-                        for (int idx = cidx; idx <= toIdx; idx += stp)
+                        for (int idx = cidx; idx != toIdx; idx += stp)
                         {
                             PostClass post;
                             try
@@ -5697,7 +5697,7 @@ namespace OpenTween
                 else
                 {
                     // 通常検索
-                    for (int idx = cidx; idx <= toIdx; idx += stp)
+                    for (int idx = cidx; idx != toIdx; idx += stp)
                     {
                         PostClass post;
                         try
@@ -7015,7 +7015,7 @@ namespace OpenTween
                     fIdx = _curList.SelectedIndices[0] + 1;
                     if (fIdx > _curList.VirtualListSize - 1) return;
                 }
-                toIdx = _curList.VirtualListSize - 1;
+                toIdx = _curList.VirtualListSize;
                 stp = 1;
             }
             else
@@ -7029,11 +7029,11 @@ namespace OpenTween
                     fIdx = _curList.SelectedIndices[0] - 1;
                     if (fIdx < 0) return;
                 }
-                toIdx = 0;
+                toIdx = -1;
                 stp = -1;
             }
 
-            for (int idx = fIdx; idx == toIdx; idx += stp)
+            for (int idx = fIdx; idx != toIdx; idx += stp)
             {
                 if (_statuses[_curTab.Text, idx].IsFav)
                 {
@@ -7068,7 +7068,7 @@ namespace OpenTween
                 {
                     fIdx = ListTab.SelectedIndex - 1;
                 }
-                toIdx = 0;
+                toIdx = -1;
                 stp = -1;
             }
             else
@@ -7082,12 +7082,12 @@ namespace OpenTween
                 {
                     fIdx = ListTab.SelectedIndex + 1;
                 }
-                toIdx = ListTab.TabCount - 1;
+                toIdx = ListTab.TabCount;
                 stp = 1;
             }
 
             bool found = false;
-            for (int tabidx = fIdx; tabidx == toIdx; tabidx += stp)
+            for (int tabidx = fIdx; tabidx != toIdx; tabidx += stp)
             {
                 if (_statuses.Tabs[ListTab.TabPages[tabidx].Text].TabType == MyCommon.TabUsageType.DirectMessage) continue; // Directタブは対象外
                 for (int idx = 0; idx < ((DetailsListView)ListTab.TabPages[tabidx].Tag).VirtualListSize; idx++)
@@ -7117,14 +7117,14 @@ namespace OpenTween
             {
                 fIdx = _curList.SelectedIndices[0] + 1;
                 if (fIdx > _curList.VirtualListSize - 1) return;
-                toIdx = _curList.VirtualListSize - 1;
+                toIdx = _curList.VirtualListSize;
                 stp = 1;
             }
             else
             {
                 fIdx = _curList.SelectedIndices[0] - 1;
                 if (fIdx < 0) return;
-                toIdx = 0;
+                toIdx = -1;
                 stp = -1;
             }
 
@@ -7171,14 +7171,14 @@ namespace OpenTween
             {
                 fIdx = _curList.SelectedIndices[0] + 1;
                 if (fIdx > _curList.VirtualListSize - 1) return;
-                toIdx = _curList.VirtualListSize - 1;
+                toIdx = _curList.VirtualListSize;
                 stp = 1;
             }
             else
             {
                 fIdx = _curList.SelectedIndices[0] - 1;
                 if (fIdx < 0) return;
-                toIdx = 0;
+                toIdx = -1;
                 stp = -1;
             }
 
@@ -7193,7 +7193,7 @@ namespace OpenTween
                 if (_anchorPost == null) return;
             }
 
-            for (int idx = fIdx; ; idx += stp)
+            for (int idx = fIdx; idx != toIdx; idx += stp)
             {
                 PostClass post = _statuses[_curTab.Text, idx];
                 if (post.ScreenName == _anchorPost.ScreenName ||
@@ -7209,8 +7209,6 @@ namespace OpenTween
                     _curList.EnsureVisible(idx);
                     break;
                 }
-
-                if (idx == toIdx) break;
             }
         }
 
-- 
2.11.0