From d0cec9c1cd61e5edaed0f0ff50cb1d29ca9100de Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Sat, 28 Feb 2004 16:41:55 +0000 Subject: [PATCH] - fix for restoring applications using task bar buttons - project file maintainancement - docu update svn path=/trunk/; revision=8451 --- reactos/subsys/system/explorer/doc/changes.txt | 1 + reactos/subsys/system/explorer/taskbar/taskbar.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/reactos/subsys/system/explorer/doc/changes.txt b/reactos/subsys/system/explorer/doc/changes.txt index b686e73ee29..7715b521dce 100644 --- a/reactos/subsys/system/explorer/doc/changes.txt +++ b/reactos/subsys/system/explorer/doc/changes.txt @@ -67,3 +67,4 @@ If you search for more information, look into the CVS repository. fixes for leaking GDI handles 25.02.2004 m. fuchs rebar control for desktop bar 28.02.2004 m. fuchs "minimize all" functionality + various fixes for notification icons, task bar and desktop switching diff --git a/reactos/subsys/system/explorer/taskbar/taskbar.cpp b/reactos/subsys/system/explorer/taskbar/taskbar.cpp index 5027c0c2ec4..6eb73ab042b 100644 --- a/reactos/subsys/system/explorer/taskbar/taskbar.cpp +++ b/reactos/subsys/system/explorer/taskbar/taskbar.cpp @@ -201,7 +201,9 @@ int TaskBar::Notify(int id, NMHDR* pnmh) void TaskBar::ActivateApp(TaskBarMap::iterator it, bool can_minimize) { HWND hwnd = it->first; - bool minimize_it = can_minimize && (hwnd==GetForegroundWindow() || hwnd==_last_foreground_wnd); + + bool minimize_it = can_minimize && !IsIconic(hwnd) && + (hwnd==GetForegroundWindow() || hwnd==_last_foreground_wnd); // switch to selected application window if (!minimize_it)