Commit: dab80b5c530d5405aed2dbb816344cdd906c3769 - FolderCategorizer (git)

ファイル整理用ツールのWinFormサンプル実装

Commit MetaInfo

• Revisión: dab80b5c530d5405aed2dbb816344cdd906c3769 (tree)
• Tiempo: 2018-12-24 08:54:33
• Autor: yoshy <yoshy@user...>
• Commiter: yoshy

Log Message

テスト - ドラッグイメージにテキスト描画を追加

Cambiar Resumen

• modified: FolderCategorizer/Presentation/View/MainForm.cs

Diferencia incremental

--- a/FolderCategorizer/Presentation/View/MainForm.cs
+++ b/FolderCategorizer/Presentation/View/MainForm.cs
@@ -89,8 +89,6 @@ namespace FolderCategorizer.Presentation.View
 
             public List<ListViewItem> SelectedFileListViewItems { get; set; } = null;
 
-            public List<int> SelectedFileListViewItemIndices { get; set; } = null;
-
             public List<TreeNode> SelectedFolderTreeViewNodes { get; set; } = null;
 
             public List<string> ProhibitedDropFolderTopPaths { get; set; } = null;
@@ -3626,15 +3624,12 @@ namespace FolderCategorizer.Presentation.View
 
         private void DoDragDropFileList_DraggedFileListEntries_CreateEntries(ListView lv, TreeView tvSrcFolder1, TreeView tvSrcFolder2)
         {
-            List<int> selectedItemIndeices = new List<int>(lv.SelectedItems.Count);
             List<ListViewItem> selectedItems = new List<ListViewItem>(lv.SelectedItems.Count);
 
             List<string> prohibitedFolders = new List<string>();
 
-            //foreach (ListViewItem lvi in lvFileList.SelectedItems)
-            foreach (int i in lvFileList.SelectedIndices)
+            foreach (ListViewItem lvi in lvFileList.SelectedItems)
             {
-                ListViewItem lvi = lvFileList.Items[i];
                 FileListEntry entry = FileListEntry.FromTagOf(lvi);
 
                 switch (entry.Type)
@@ -3654,7 +3649,6 @@ namespace FolderCategorizer.Presentation.View
                         continue;
                 }
 
-                selectedItemIndeices.Add(i);
                 selectedItems.Add(lvi);
             }
 
@@ -3664,7 +3658,6 @@ namespace FolderCategorizer.Presentation.View
                     new TreeNode[] { tvSrcFolder1.SelectedNode, tvSrcFolder2.SelectedNode });
 
             DraggedFileListEntries = new DraggedFileListEntriesHolder(selectedItems, selectedNodes, prohibitedFolders, GetCurrentRelativePath());
-            DraggedFileListEntries.SelectedFileListViewItemIndices = selectedItemIndeices;
         }
 
         private DragDropEffects DragEnterFileList_DraggedFileListEntries(DraggedFileListEntriesHolder holder, int keyState, DragDropEffects allowedEffect, ListView lv, Point p)
@@ -4664,7 +4657,6 @@ namespace FolderCategorizer.Presentation.View
                 DoDragDropFileList_DraggedFileListEntries_CreateEntries(lvFileList, tvSrcFolder1, tvSrcFolder2);
 
                 Rectangle rcItems = new Rectangle();
-                //foreach (ListViewItem item in lvFileList.SelectedItems)
                 foreach (ListViewItem item in DraggedFileListEntries.SelectedFileListViewItems)
                 {
                         rcItems = !rcItems.IsEmpty ? Rectangle.Union(rcItems, item.Bounds) : item.Bounds;
@@ -4683,66 +4675,29 @@ namespace FolderCategorizer.Presentation.View
 
                 using (Graphics g = Graphics.FromImage(image))
                 {
-                    g.DrawRectangle(SystemPens.WindowText, rcItems);
-                    //foreach (ListViewItem item in lvFileList.SelectedItems)
-                    //{
-                    //    Point ip = item.Position;
-                    //    ip.Offset(-rcItems.X, -rcItems.Y);
-
-                    //    g.DrawString(item.Text, item.Font, SystemBrushes.WindowText, ip);
-                    //}
-
-                    // @see https://microsoft.public.win32.programmer.ui.narkive.com/Gc4nQBlx/listview-lvm-createdragimage-weirdness
-                    // @see https://groups.yahoo.com/neo/groups/wtl/conversations/topics/5110
-                    Font restoreFont = lvFileList.Font;
+                    IntPtr hDC = g.GetHdc();
 
-                    IntPtr hTempFont = FontHelper.CreateFont(
-                            (int)-restoreFont.Size, 0, 0, 0,
-                            FontHelper.FW_NORMAL, 0, 0, 0,
-                            FontHelper.DEFAULT_CHARSET, FontHelper.OUT_DEFAULT_PRECIS, FontHelper.CLIP_DEFAULT_PRECIS,
-                            FontHelper.DEFAULT_QUALITY, FontHelper.VARIABLE_PITCH | FontHelper.FF_DONTCARE, "MS Sans Serif");
-
-                    Logger.Info($"hTempFont 0x{hTempFont.ToString("x8")}, size {restoreFont.Size}, Name {lvFileList.Font.Name}");
-
-                    //Font tempFont = Font.FromHfont(hTempFont);
-                    //lvFileList.Font = tempFont;
-
-                    using (Graphics gLV = lvFileList.CreateGraphics())
+                    foreach (ListViewItem item in DraggedFileListEntries.SelectedFileListViewItems)
                     {
-                        IntPtr hLvDC = gLV.GetHdc();
-                        //IntPtr hOldFont = FontHelper.SelectObject(lvFileList.Handle, hTempFont);
-                        IntPtr hOldFont = FontHelper.SelectObject(hLvDC, hTempFont);
-
-                        Logger.Info($"hLvDC {hLvDC.ToString("X8")}, hOldFont 0x{hOldFont.ToString("x8")}");
+                        ListViewHelper.POINTAPI pt;
 
-                        IntPtr hDC = g.GetHdc();
-                        FontHelper.SelectObject(hDC, hTempFont);
-                        FontHelper.SetTextColor(hDC, 0x000000FF);
-                        //FontHelper.SetBkMode(hDC, 1);
+                        IntPtr h = ListViewHelper.CreateDragImage(lvFileList.Handle, item.Index, out pt);
 
-                        //foreach (int i in lvFileList.SelectedIndices)
-                        foreach (int i in DraggedFileListEntries.SelectedFileListViewItemIndices)
-                        {
-                            ListViewHelper.POINTAPI pt;
-
-                            IntPtr h = ListViewHelper.CreateDragImage(lvFileList.Handle, i, out pt);
-
-                            ImageListHelper.ImageList_Draw(h, 0, hDC, pt.x - rcItems.X, pt.y - rcItems.Y,
-                                    (uint)(ImageListHelper.ILD_FLAGS.ILD_NORMAL | ImageListHelper.ILD_FLAGS.ILD_SELECTED));
-
-                            ImageListHelper.ImageList_Destroy(h);
-                        }
+                        ImageListHelper.ImageList_Draw(h, 0, hDC, pt.x - rcItems.X, pt.y - rcItems.Y,
+                                (uint)(ImageListHelper.ILD_FLAGS.ILD_NORMAL)); // | ImageListHelper.ILD_FLAGS.ILD_SELECTED));
 
-                        gLV.ReleaseHdc();
+                        ImageListHelper.ImageList_Destroy(h);
                     }
 
                     g.ReleaseHdc();
 
-                    lvFileList.Font = restoreFont;
-
-                    //tempFont.Dispose();
-                    FontHelper.DeleteObject(hTempFont);
+                    foreach (ListViewItem item in DraggedFileListEntries.SelectedFileListViewItems)
+                    {
+                        Point ip = item.Position;
+                        ip.Offset(-rcItems.X + dpiHelper.HDPIValue(16 + 2), -rcItems.Y);
 
+                        g.DrawString(item.Text, item.Font, SystemBrushes.WindowText, ip);
+                    }
                 }
 
                 ImageList imageList = new ImageList