From 0f7b4b21749e9790a42a61030287470650cdbff0 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 16 Apr 2018 15:39:35 +0200
Subject: [PATCH] file browser: correct error showing icon of parent folder in
folder pane
---
VECTO/File Browser/FileBrowserDialog.vb | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/VECTO/File Browser/FileBrowserDialog.vb b/VECTO/File Browser/FileBrowserDialog.vb
index 175ad7f8f4..444f2672cc 100644
--- a/VECTO/File Browser/FileBrowserDialog.vb
+++ b/VECTO/File Browser/FileBrowserDialog.vb
@@ -788,14 +788,17 @@ Public Class FileBrowserDialog
Dim di As New DirectoryInfo(_myFolder)
Dim aryFi = di.GetDirectories(searchPat)
ImageList1.Images.Clear()
- Dim shinfo = New SHFILEINFO()
- shinfo.szDisplayName = New String(Chr(0), 260)
- shinfo.szTypeName = New String(Chr(0), 80)
- SHGetFileInfo(_myFolder, 0, shinfo, Marshal.SizeOf(shinfo), SHGFI_ICON Or SHGFI_SMALLICON)
- Dim myIcon = Icon.FromHandle(shinfo.hIcon)
- ImageList1.Images.Add(myIcon)
+ Dim x = ImageList1.Images.Count - 1
For Each fi In aryFi
- ListViewFolder.Items.Add(fi.ToString, 0)
+ x += 1
+ Dim shinfo = New SHFILEINFO()
+ shinfo.szDisplayName = New String(Chr(0), 260)
+ shinfo.szTypeName = New String(Chr(0), 80)
+ SHGetFileInfo(Path.Combine(_myFolder, fi.ToString()), 0, shinfo, Marshal.SizeOf(shinfo), SHGFI_ICON Or SHGFI_SMALLICON)
+ Dim myIcon = Icon.FromHandle(shinfo.hIcon)
+ ImageList1.Images.Add(myIcon)
+ 'For Each fi In aryFi
+ ListViewFolder.Items.Add(fi.ToString, x)
Next
Catch ex As Exception
ListViewFolder.Items.Add("<ERROR: " & ex.Message.ToString & ">")
--
GitLab