From 6c4148453ba184cfa8b9b4be14bba4f029b29662 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 27 Oct 2016 10:44:16 +0900
Subject: [PATCH] =?utf8?q?PostClass.IsDeleted=E3=81=ABtrue=E3=81=8C?=
 =?utf8?q?=E3=82=BB=E3=83=83=E3=83=88=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84?=
 =?utf8?q?=E3=81=A6=E3=82=82=E7=99=BA=E8=A8=80=E4=B8=80=E8=A6=A7=E4=B8=8A?=
 =?utf8?q?=E3=81=A7(DELETED)=E3=81=AB=E5=A4=89=E5=8C=96=E3=81=97=E3=81=AA?=
 =?utf8?q?=E3=81=84=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

発言一覧の描画時に ListViewSubItem.Text 経由ではなく直接 PostClass の
プロパティを参照するようになったことが原因

Fixes: d1e8cd58 ("スクリーンリーダーで引用ツイートの内容が発言一覧上でも読み上げられるように修正")
---
 OpenTween/Resources/ChangeLog.txt |  1 +
 OpenTween/Tween.cs                | 55 +++++++++++++++++++++++----------------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/OpenTween/Resources/ChangeLog.txt b/OpenTween/Resources/ChangeLog.txt
index 091960b2..8b230a4b 100644
--- a/OpenTween/Resources/ChangeLog.txt
+++ b/OpenTween/Resources/ChangeLog.txt
@@ -6,6 +6,7 @@
  * FIX: ツイートURLのコピー時に余分な改行文字が末尾に付く不具合を修正
  * FIX: Bing翻訳機能が使用できなくなっていた問題を修正
  * FIX: 未読発言への移動時にエラーが発生する不具合を修正 (thx @nue_of_k!)
+ * FIX: ツイートの削除時に「(DELETED)」の表示がされなくなっていた不具合を修正
 
 ==== Ver 1.3.5(2016/10/01)
  * NEW: 140文字を越えるツイートの表示に対応しました
diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 5f678a10..d932defe 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -5104,7 +5104,7 @@ namespace OpenTween
                         using (Font fnt = new Font(e.Item.Font, FontStyle.Bold))
                         {
                             TextRenderer.DrawText(e.Graphics,
-                                                    post.TextSingleLine,
+                                                    post.IsDeleted ? "(DELETED)" : post.TextSingleLine,
                                                     e.Item.Font,
                                                     Rectangle.Round(rct),
                                                     color,
@@ -5123,30 +5123,39 @@ namespace OpenTween
                                                     TextFormatFlags.NoPrefix);
                         }
                     }
-                    else if (drawLineCount == 1)
-                    {
-                        TextRenderer.DrawText(e.Graphics,
-                                                e.ColumnIndex != 2 ? e.SubItem.Text : post.TextSingleLine,
-                                                e.Item.Font,
-                                                Rectangle.Round(rct),
-                                                color,
-                                                TextFormatFlags.SingleLine |
-                                                TextFormatFlags.EndEllipsis |
-                                                TextFormatFlags.GlyphOverhangPadding |
-                                                TextFormatFlags.NoPrefix |
-                                                TextFormatFlags.VerticalCenter);
-                    }
                     else
                     {
-                        TextRenderer.DrawText(e.Graphics,
-                                                e.ColumnIndex != 2 ? e.SubItem.Text : post.TextSingleLine,
-                                                e.Item.Font,
-                                                Rectangle.Round(rct),
-                                                color,
-                                                TextFormatFlags.WordBreak |
-                                                TextFormatFlags.EndEllipsis |
-                                                TextFormatFlags.GlyphOverhangPadding |
-                                                TextFormatFlags.NoPrefix);
+                        string text;
+                        if (e.ColumnIndex != 2)
+                            text = e.SubItem.Text;
+                        else
+                            text = post.IsDeleted ? "(DELETED)" : post.TextSingleLine;
+
+                        if (drawLineCount == 1)
+                        {
+                            TextRenderer.DrawText(e.Graphics,
+                                                    text,
+                                                    e.Item.Font,
+                                                    Rectangle.Round(rct),
+                                                    color,
+                                                    TextFormatFlags.SingleLine |
+                                                    TextFormatFlags.EndEllipsis |
+                                                    TextFormatFlags.GlyphOverhangPadding |
+                                                    TextFormatFlags.NoPrefix |
+                                                    TextFormatFlags.VerticalCenter);
+                        }
+                        else
+                        {
+                            TextRenderer.DrawText(e.Graphics,
+                                                    text,
+                                                    e.Item.Font,
+                                                    Rectangle.Round(rct),
+                                                    color,
+                                                    TextFormatFlags.WordBreak |
+                                                    TextFormatFlags.EndEllipsis |
+                                                    TextFormatFlags.GlyphOverhangPadding |
+                                                    TextFormatFlags.NoPrefix);
+                        }
                     }
                     //if (e.ColumnIndex == 6) this.DrawListViewItemStateIcon(e, rct);
                 }
-- 
2.11.0