- Use a separate icon for minimizing windows.

[reactos.git] / reactos / subsys / system / explorer / taskbar / quicklaunch.cpp

diff --git a/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp b/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp
index ecfa6f3..8214d93 100644 (file)
--- a/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp
+++ b/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp
@@ -105,7 +105,11 @@ void QuickLaunchBar::AddShortcuts()
                RecursiveCreateDirectory(path);
                _dir = new ShellDirectory(GetDesktopFolder(), path, _hwnd);
 
-               _dir->smart_scan(SORT_NAME, SCAN_EXTRACT_ICONS|SCAN_FILESYSTEM);
+               _dir->smart_scan(SORT_NAME, /*SCAN_EXTRACT_ICONS|*/SCAN_FILESYSTEM);
+
+                // immediatelly extract the shortcut icons
+               for(Entry*entry=_dir->_down; entry; entry=entry->_next)
+                       entry->_icon_id = entry->safe_extract_icon(ICF_NORMAL);
        } catch(COMException&) {
                return;
        }
@@ -117,7 +121,7 @@ void QuickLaunchBar::AddShortcuts()
        COLORREF bk_color = GetSysColor(COLOR_BTNFACE);
        HBRUSH bk_brush = GetSysColorBrush(COLOR_BTNFACE);
 
-       AddButton(ID_MINIMIZE_ALL, g_Globals._icon_cache.get_icon(ICID_LOGOFF/*@@*/).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_MINIMIZE_ALL), NULL);
+       AddButton(ID_MINIMIZE_ALL, g_Globals._icon_cache.get_icon(ICID_MINIMIZE/*@@*/).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_MINIMIZE_ALL), NULL);
        AddButton(ID_EXPLORE, g_Globals._icon_cache.get_icon(ICID_EXPLORER).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_TITLE), NULL);
 
        TBBUTTON sep = {0, -1, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0};