Commit: 691196ad7e6aaf1afab0f7a38fadfa237beed25b - Twirunrun (git)

Commit MetaInfo

• Revision: 691196ad7e6aaf1afab0f7a38fadfa237beed25b (tree)
• Zeit: 2011-01-19 16:59:00
• Autor: azyobuzin <azyobuzin@user...>
• Commiter: azyobuzin

Log Message

・StatusesListViewでオーナードローするように
・正規表現不具合を直した

Ändern Zusammenfassung

• delete: "\202\302\202\242\202\351\202\361\202\351\202\361/Controls/StatusBrowser.cs"
• delete: "\202\302\202\242\202\351\202\361\202\351\202\361/Controls/StatusesListView.cs"
• delete: "\202\302\202\242\202\351\202\361\202\351\202\361/Icons.cs"

Diff

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/StatusBrowser.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/StatusBrowser.cs"
@@ -54,7 +54,7 @@ namespace Azyobuzi.Twirunrun
                 .RegexReplace(@"https?://[\w\d/%#$&?()~_.=+\-!]+", (match) =>
                     string.Format(@"<a href=""{0}"">{1}</a>",
                         match.ToString().HtmlAttributeEncode(), match.ToString().HtmlEncode()))
-                .RegexReplace(@"[@＠]\w+", (match) =>
+                .RegexReplace(@"[@＠][a-zA-Z0-9_]+"/*\wだとうまく認識しない*/, (match) =>
                     string.Format(@"{0}<a href=""https://twitter.com/{1}"">{1}</a>", match.ToString()[0], match.ToString().Substring(1)))
                 .RegexReplace(@"(^|\W)([#＃][a-zA-Z0-9_\-]+)", (match) =>
                     string.Format(@"{0}<a href=""https://twitter.com/search?q={1}"">{2}</a>", match.Groups[1].ToString(), Uri.EscapeDataString(match.Groups[2].ToString()).HtmlAttributeEncode(), match.Groups[2].ToString()));

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/StatusesListView.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Controls/StatusesListView.cs"
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
+using System.Drawing;
 using System.Windows.Forms;
 
 namespace Azyobuzi.Twirunrun
@@ -18,10 +16,10 @@ namespace Azyobuzi.Twirunrun
             this.Columns.Add("名前", Settings.Instance.NameWidth);
             this.Columns.Add("投稿");
             this.SizeChanged += (sender, e) => this.AutoResizeColumn(1, ColumnHeaderAutoResizeStyle.ColumnContent);
+            this.OwnerDraw = true;
+            this.DrawSubItem += this_DrawSubItem;
         }
-
-        public const string NAME_SUBITEM = "NameSubItem";//SubItem識別用
-
+        
         private IList<StatusInfo> statuses;
         public IList<StatusInfo> Statuses
         {
@@ -59,9 +57,70 @@ namespace Azyobuzi.Twirunrun
 
             lvi.SubItems.Add(item.Text.Replace('\n', ' '));
 
-            lvi.SubItems[0].Tag = NAME_SUBITEM;
-
             e.Item = lvi;
         }
+
+        //ラベルは保留
+        private void this_DrawSubItem(object sender, DrawListViewSubItemEventArgs e)
+        {
+            if (e.ItemIndex < 0 || e.ColumnIndex < 0) return;
+
+            using (var b = new SolidBrush(
+                (e.ItemState & ListViewItemStates.Selected) == ListViewItemStates.Selected ?
+                    SystemColors.Highlight : e.SubItem.BackColor))
+            {
+                e.Graphics.FillRectangle(b, e.Bounds);
+            }
+
+            var foreColor = (e.ItemState & ListViewItemStates.Selected) == ListViewItemStates.Selected ?
+                SystemColors.HighlightText : e.SubItem.ForeColor;
+
+            e.ColumnIndex.SelectCase()
+                .Case(0, () =>//名前部
+                {
+                    const int LEFT_SPACE = 2;
+                    var itemPoint = e.Bounds.Location;
+                    var post = Statuses[e.ItemIndex];
+                    //アイコン描画
+                    int iconsize = e.Bounds.Height - 1;
+                    var icon = Icons.GetItem(post.ProfileImageUri);
+                    if (icon == null)
+                    {
+                        Icons.AddAsync(post.ProfileImageUri);
+                    }
+                    else
+                    {
+                        e.Graphics.DrawImage(icon, itemPoint.X + LEFT_SPACE, itemPoint.Y, iconsize, iconsize);
+                    }
+                    //名前描画
+                    TextRenderer.DrawText(e.Graphics,
+                        e.SubItem.Text,
+                        e.SubItem.Font,
+                        new Rectangle(
+                            itemPoint.X + LEFT_SPACE + iconsize + LEFT_SPACE,
+                            itemPoint.Y,
+                            e.Bounds.Width - LEFT_SPACE - iconsize - LEFT_SPACE,
+                            e.Bounds.Height
+                        ),
+                        foreColor,
+                        TextFormatFlags.NoPrefix |
+                        TextFormatFlags.VerticalCenter |
+                        TextFormatFlags.EndEllipsis |
+                        TextFormatFlags.SingleLine
+                    );
+                })
+                .Case(1, () =>//投稿内容部
+                {
+                    TextRenderer.DrawText(e.Graphics,
+                        e.SubItem.Text,
+                        e.SubItem.Font,
+                        e.Bounds,
+                        foreColor,
+                        TextFormatFlags.NoPrefix |
+                        TextFormatFlags.VerticalCenter |
+                        TextFormatFlags.WordEllipsis |
+                        TextFormatFlags.SingleLine);
+                });
+        }
     }
 }

--- "a/\202\302\202\242\202\351\202\361\202\351\202\361/Icons.cs"
+++ "b/\202\302\202\242\202\351\202\361\202\351\202\361/Icons.cs"
@@ -39,10 +39,16 @@ namespace Azyobuzi.Twirunrun
             {
                 try
                 {
-                    var result = CreateIcon(uri);
+                    var _uri = e.Argument.ToString();
+                    Image result;
+                    using (var wc = new WebClient())
+                    {
+                        result = wc.DownloadImage(_uri);
+                    }
+
                     lock (LockObj)
                     {
-                        Icons.Add(uri, result);
+                        Icons.Add(_uri, result);
                     }
                 }
                 catch { }
@@ -55,7 +61,7 @@ namespace Azyobuzi.Twirunrun
                     AddCompleted();
                 }
             };
-            bw.RunWorkerAsync();
+            bw.RunWorkerAsync(uri);
         }
 
         private static int RunnningCount = 0;
@@ -67,45 +73,45 @@ namespace Azyobuzi.Twirunrun
 
 
 
-        /// <summary>
-        /// 指定したURIからアイコンを作成する
-        /// </summary>
-        public static Bitmap CreateIcon(string uri)
-        {
-            const int RESULT_SIZE = 48;
-
-            Image img;
-
-            using (var wc = new WebClient())
-            {
-                img = wc.DownloadImage(uri);
-            }
-
-            if (img.Width == img.Height)
-                return new Bitmap(img, RESULT_SIZE, RESULT_SIZE);
-
-            int size = Math.Min(img.Width, img.Height);
-            using (Bitmap temp = new Bitmap(size, size))
-            {
-                if (img.Width > img.Height)
-                {
-                    int left = img.Width / 2 - ((/*img.Width - */img.Height) / 2);
-                    using (var g = Graphics.FromImage(temp))
-                    {
-                        g.DrawImage(img, 0, 0, new Rectangle(left, 0, size, size), GraphicsUnit.Pixel);
-                    }
-                }
-                else if (img.Width < img.Height)
-                {
-                    int top = img.Height / 2 - ((/*img.Height - */img.Width) / 2);
-                    using (var g = Graphics.FromImage(temp))
-                    {
-                        g.DrawImage(img, 0, 0, new Rectangle(0, top, size, size), GraphicsUnit.Pixel);
-                    }
-                }
-
-                return new Bitmap(temp, RESULT_SIZE, RESULT_SIZE);
-            }
-        }
+        ///// <summary>
+        ///// 指定したURIからアイコンを作成する
+        ///// </summary>
+        //public static Bitmap CreateIcon(string uri)
+        //{
+        //    const int RESULT_SIZE = 48;
+
+        //    Image img;
+
+        //    using (var wc = new WebClient())
+        //    {
+        //        img = wc.DownloadImage(uri);
+        //    }
+
+        //    if (img.Width == img.Height)
+        //        return new Bitmap(img, RESULT_SIZE, RESULT_SIZE);
+
+        //    int size = Math.Min(img.Width, img.Height);
+        //    using (Bitmap temp = new Bitmap(size, size))
+        //    {
+        //        if (img.Width > img.Height)
+        //        {
+        //            int left = img.Width / 2 - ((/*img.Width - */img.Height) / 2);
+        //            using (var g = Graphics.FromImage(temp))
+        //            {
+        //                g.DrawImage(img, 0, 0, new Rectangle(left, 0, size, size), GraphicsUnit.Pixel);
+        //            }
+        //        }
+        //        else if (img.Width < img.Height)
+        //        {
+        //            int top = img.Height / 2 - ((/*img.Height - */img.Width) / 2);
+        //            using (var g = Graphics.FromImage(temp))
+        //            {
+        //                g.DrawImage(img, 0, 0, new Rectangle(0, top, size, size), GraphicsUnit.Pixel);
+        //            }
+        //        }
+
+        //        return new Bitmap(temp, RESULT_SIZE, RESULT_SIZE);
+        //    }
+        //}
     }
 }