Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-30 19:14:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

better foreground window handling (VCL applications had problems with the old one)

Browse source 
svn path=/trunk/; revision=8106
This commit is contained in:
Martin Fuchs 2004-02-08 22:47:25 +00:00
parent a320c0cca9
commit 9a53ebcb92
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
reactos/subsys/system/explorer/taskbar/taskbar.cpp
View file

@ -297,7 +297,10 @@ BOOL CALLBACK TaskBar::EnumWndProc(HWND hwnd, LPARAM lparam)
++entry._used; ++entry._used;
btn.idCommand = entry._id; btn.idCommand = entry._id;
if (hwnd == GetForegroundWindow()) { HWND foreground = GetForegroundWindow();
HWND foreground_owner = GetWindow(foreground, GW_OWNER);
if (hwnd==foreground || hwnd==foreground_owner) {
btn.fsState |= TBSTATE_PRESSED|TBSTATE_CHECKED; btn.fsState |= TBSTATE_PRESSED|TBSTATE_CHECKED;
pThis->_last_foreground_wnd = hwnd; pThis->_last_foreground_wnd = hwnd;
} }
@ -311,6 +314,7 @@ BOOL CALLBACK TaskBar::EnumWndProc(HWND hwnd, LPARAM lparam)
entry._btn_idx = SendMessage(pThis->_htoolbar, TB_BUTTONCOUNT, 0, 0); entry._btn_idx = SendMessage(pThis->_htoolbar, TB_BUTTONCOUNT, 0, 0);
SendMessage(pThis->_htoolbar, TB_INSERTBUTTON, entry._btn_idx, (LPARAM)&btn); SendMessage(pThis->_htoolbar, TB_INSERTBUTTON, entry._btn_idx, (LPARAM)&btn);
SendMessage(pThis->_htoolbar, TB_AUTOSIZE, 0, 0); ///@todo useless?
} else { } else {
// refresh attributes of existing buttons // refresh attributes of existing buttons
if (btn.fsState != entry._fsState) if (btn.fsState != entry._fsState)
@ -365,19 +369,23 @@ void TaskBar::Refresh()
} }
} }
// remove buttons from right to left if (!btn_idx_to_delete.empty()) {
for(set<int>::reverse_iterator it=btn_idx_to_delete.rbegin(); it!=btn_idx_to_delete.rend(); ++it) { // remove buttons from right to left
int idx = *it; for(set<int>::reverse_iterator it=btn_idx_to_delete.rbegin(); it!=btn_idx_to_delete.rend(); ++it) {
int idx = *it;
SendMessage(_htoolbar, TB_DELETEBUTTON, idx, 0); SendMessage(_htoolbar, TB_DELETEBUTTON, idx, 0);
for(TaskBarMap::iterator it=_map.begin(); it!=_map.end(); ++it) { for(TaskBarMap::iterator it=_map.begin(); it!=_map.end(); ++it) {
TaskBarEntry& entry = it->second; TaskBarEntry& entry = it->second;
// adjust button indexes // adjust button indexes
if (entry._btn_idx > idx) if (entry._btn_idx > idx)
--entry._btn_idx; --entry._btn_idx;
}
} }
SendMessage(_htoolbar, TB_AUTOSIZE, 0, 0); ///@todo useless?
} }
} }