5 Nov
2014
5 Nov
'14
10:58 p.m.
Author: dquintana
Date: Wed Nov 5 22:58:53 2014
New Revision: 65274
URL: http://svn.reactos.org/svn/reactos?rev=65274&view=rev
Log:
[EXPLORER-NEW]
* Make use of the CToolbar<T> class to implement a CTaskToolbar.
* Change the CTaskSwitchWnd class to use CTaskToolbar instead of managing the HWND
directly.
* Silence logspam in CTrayBandSite.
* Fix CNotifyToolbar to properly.
* Move the call to SetMetrics to be called only on initialization, instead of every time
an icon changes.
* Make the start button a CContainedWindowT instead of a raw HWND. TODO: Make a
CStartButton class to manage it.
[include/reactos/rosctrls.h]
* Some improvements needed by the taskbar.
Modified:
branches/shell-experiments/base/shell/explorer-new/explorer.cpp
branches/shell-experiments/base/shell/explorer-new/taskswnd.cpp
branches/shell-experiments/base/shell/explorer-new/tbsite.cpp
branches/shell-experiments/base/shell/explorer-new/trayntfy.cpp
branches/shell-experiments/base/shell/explorer-new/traywnd.cpp
branches/shell-experiments/include/reactos/rosctrls.h
Modified: branches/shell-experiments/base/shell/explorer-new/explorer.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex…
==============================================================================
--- branches/shell-experiments/base/shell/explorer-new/explorer.cpp [iso-8859-1]
(original)
+++ branches/shell-experiments/base/shell/explorer-new/explorer.cpp [iso-8859-1] Wed Nov
5 22:58:53 2014
@@ -218,7 +218,7 @@
#if !WIN7_COMPAT_MODE
BOOL CreateShellDesktop = FALSE;
- DbgPrint("Explorer starting... Commandline: %S\n", lpCmdLine);
+ TRACE("Explorer starting... Commandline: %S\n", lpCmdLine);
/*
* Set our shutdown parameters: we want to shutdown the very last,
Modified: branches/shell-experiments/base/shell/explorer-new/taskswnd.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex…
==============================================================================
--- branches/shell-experiments/base/shell/explorer-new/taskswnd.cpp [iso-8859-1]
(original)
+++ branches/shell-experiments/base/shell/explorer-new/taskswnd.cpp [iso-8859-1] Wed Nov
5 22:58:53 2014
@@ -100,10 +100,82 @@
#define TASK_ITEM_ARRAY_ALLOC 64
+class CTaskToolbar :
+ public CToolbar<TASK_ITEM>
+{
+public:
+ INT UpdateTbButtonSpacing(IN BOOL bHorizontal, IN BOOL bThemed, IN UINT uiRows = 0,
IN UINT uiBtnsPerLine = 0)
+ {
+ TBMETRICS tbm;
+
+ tbm.cbSize = sizeof(tbm);
+ tbm.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING;
+
+ tbm.cxBarPad = tbm.cyBarPad = 0;
+
+ if (bThemed)
+ {
+ tbm.cxButtonSpacing = 0;
+ tbm.cyButtonSpacing = 0;
+ }
+ else
+ {
+ if (bHorizontal || uiBtnsPerLine > 1)
+ tbm.cxButtonSpacing = (3 * GetSystemMetrics(SM_CXEDGE) / 2);
+ else
+ tbm.cxButtonSpacing = 0;
+
+ if (!bHorizontal || uiRows > 1)
+ tbm.cyButtonSpacing = (3 * GetSystemMetrics(SM_CYEDGE) / 2);
+ else
+ tbm.cyButtonSpacing = 0;
+ }
+
+ SetMetrics(&tbm);
+
+ return tbm.cxButtonSpacing;
+ }
+
+ VOID BeginUpdate()
+ {
+ SetRedraw(FALSE);
+ }
+
+ VOID EndUpdate()
+ {
+ SendMessageW(WM_SETREDRAW, TRUE);
+ InvalidateRect(NULL, TRUE);
+ }
+
+ BOOL SetButtonCommandId(IN INT iButtonIndex, IN INT iCommandId)
+ {
+ TBBUTTONINFO tbbi;
+
+ tbbi.cbSize = sizeof(tbbi);
+ tbbi.dwMask = TBIF_BYINDEX | TBIF_COMMAND;
+ tbbi.idCommand = iCommandId;
+
+ return SetButtonInfo(iButtonIndex, &tbbi) != 0;
+ }
+
+public:
+ BEGIN_MSG_MAP(CNotifyToolbar)
+ END_MSG_MAP()
+
+ BOOL Initialize(HWND hWndParent)
+ {
+ DWORD styles = WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN |
+ TBSTYLE_TOOLTIPS | TBSTYLE_WRAPABLE | TBSTYLE_LIST | TBSTYLE_TRANSPARENT |
+ CCS_TOP | CCS_NORESIZE | CCS_NODIVIDER;
+
+ return SubclassWindow(Create(hWndParent, styles));
+ }
+};
+
class CTaskSwitchWnd :
public CWindowImpl < CTaskSwitchWnd, CWindow, CControlWinTraits >
{
- CContainedWindow TaskBar;
+ CTaskToolbar TaskBar;
HWND hWndNotify;
@@ -118,11 +190,10 @@
PTASK_ITEM ActiveTaskItem;
HTHEME TaskBandTheme;
- HWND hWndToolbar;
UINT TbButtonsPerLine;
WORD ToolbarBtnCount;
- IImageList * TaskIcons;
+ HIMAGELIST TaskIcons;
BOOL IsGroupingEnabled;
BOOL IsDestroying;
@@ -132,7 +203,6 @@
public:
CTaskSwitchWnd() :
- TaskBar(this, 1),
hWndNotify(NULL),
ShellHookMsg(NULL),
TaskGroups(NULL),
@@ -141,10 +211,11 @@
TaskItems(0),
ActiveTaskItem(0),
TaskBandTheme(NULL),
- hWndToolbar(NULL),
TbButtonsPerLine(0),
ToolbarBtnCount(0),
- TaskIcons(NULL)
+ TaskIcons(NULL),
+ IsGroupingEnabled(FALSE),
+ IsDestroying(FALSE)
{
ZeroMemory(&ButtonSize, sizeof(ButtonSize));
szBuf[0] = 0;
@@ -153,11 +224,9 @@
#define MAX_TASKS_COUNT (0x7FFF)
- VOID TaskSwitchWnd_UpdateButtonsSize(
- IN BOOL bRedrawDisabled);
-
- LPTSTR GetWndTextFromTaskItem(
- IN PTASK_ITEM TaskItem)
+ VOID TaskSwitchWnd_UpdateButtonsSize(IN BOOL bRedrawDisabled);
+
+ LPTSTR GetWndTextFromTaskItem(IN PTASK_ITEM TaskItem)
{
/* Get the window text without sending a message so we don't hang if an
application isn't responding! */
@@ -224,48 +293,14 @@
}
#endif
- VOID BeginUpdate()
- {
- ::SendMessage(hWndToolbar,
- WM_SETREDRAW,
- FALSE,
- 0);
- }
-
- VOID EndUpdate()
- {
- ::SendMessage(hWndToolbar,
- WM_SETREDRAW,
- TRUE,
- 0);
- ::InvalidateRect(hWndToolbar,
- NULL,
- TRUE);
- }
-
- BOOL SetToolbarButtonCommandId(
- IN INT iButtonIndex,
- IN INT iCommandId)
- {
- TBBUTTONINFO tbbi;
-
- tbbi.cbSize = sizeof(tbbi);
- tbbi.dwMask = TBIF_BYINDEX | TBIF_COMMAND;
- tbbi.idCommand = iCommandId;
-
- return SendMessage(hWndToolbar,
- TB_SETBUTTONINFO,
- (WPARAM) iButtonIndex,
- (LPARAM) &tbbi) != 0;
- }
-
- VOID UpdateIndexesAfterButtonInserted(
- IN INT iIndex)
+ VOID UpdateIndexesAfter(IN INT iIndex, BOOL bInserted)
{
PTASK_GROUP CurrentGroup;
PTASK_ITEM CurrentTaskItem, LastTaskItem;
INT NewIndex;
+ int offset = bInserted ? +1 : -1;
+
if (IsGroupingEnabled)
{
/* Update all affected groups */
@@ -276,10 +311,8 @@
CurrentGroup->Index >= iIndex)
{
/* Update the toolbar buttons */
- NewIndex = CurrentGroup->Index + 1;
- if (SetToolbarButtonCommandId(
- CurrentGroup->Index + 1,
- NewIndex))
+ NewIndex = CurrentGroup->Index + offset;
+ if (TaskBar.SetButtonCommandId(CurrentGroup->Index + offset,
NewIndex))
{
CurrentGroup->Index = NewIndex;
}
@@ -309,10 +342,8 @@
{
UpdateTaskItemBtn:
/* Update the toolbar buttons */
- NewIndex = CurrentTaskItem->Index + 1;
- if (SetToolbarButtonCommandId(
- CurrentTaskItem->Index + 1,
- NewIndex))
+ NewIndex = CurrentTaskItem->Index + offset;
+ if (TaskBar.SetButtonCommandId(CurrentTaskItem->Index + offset,
NewIndex))
{
CurrentTaskItem->Index = NewIndex;
}
@@ -324,73 +355,8 @@
}
}
- VOID UpdateIndexesAfterButtonDeleted(
- IN INT iIndex)
- {
- PTASK_GROUP CurrentGroup;
- PTASK_ITEM CurrentTaskItem, LastTaskItem;
- INT NewIndex;
-
- if (IsGroupingEnabled)
- {
- /* Update all affected groups */
- CurrentGroup = TaskGroups;
- while (CurrentGroup != NULL)
- {
- if (CurrentGroup->IsCollapsed &&
- CurrentGroup->Index > iIndex)
- {
- /* Update the toolbar buttons */
- NewIndex = CurrentGroup->Index - 1;
- if (SetToolbarButtonCommandId(
- CurrentGroup->Index - 1,
- NewIndex))
- {
- CurrentGroup->Index = NewIndex;
- }
- else
- CurrentGroup->Index = -1;
- }
-
- CurrentGroup = CurrentGroup->Next;
- }
- }
-
- /* Update all affected task items */
- CurrentTaskItem = TaskItems;
- LastTaskItem = CurrentTaskItem + TaskItemCount;
- while (CurrentTaskItem != LastTaskItem)
- {
- CurrentGroup = CurrentTaskItem->Group;
- if (CurrentGroup != NULL)
- {
- if (!CurrentGroup->IsCollapsed &&
- CurrentTaskItem->Index > iIndex)
- {
- goto UpdateTaskItemBtn;
- }
- }
- else if (CurrentTaskItem->Index > iIndex)
- {
- UpdateTaskItemBtn:
- /* Update the toolbar buttons */
- NewIndex = CurrentTaskItem->Index - 1;
- if (SetToolbarButtonCommandId(
- CurrentTaskItem->Index - 1,
- NewIndex))
- {
- CurrentTaskItem->Index = NewIndex;
- }
- else
- CurrentTaskItem->Index = -1;
- }
-
- CurrentTaskItem++;
- }
- }
-
- INT UpdateTaskGroupButton(
- IN PTASK_GROUP TaskGroup)
+
+ INT UpdateTaskGroupButton(IN PTASK_GROUP TaskGroup)
{
ASSERT(TaskGroup->Index >= 0);
@@ -399,8 +365,7 @@
return TaskGroup->Index;
}
- VOID ExpandTaskGroup(
- IN PTASK_GROUP TaskGroup)
+ VOID ExpandTaskGroup(IN PTASK_GROUP TaskGroup)
{
ASSERT(TaskGroup->dwTaskCount > 0);
ASSERT(TaskGroup->IsCollapsed);
@@ -414,21 +379,26 @@
HICON hIcon = 0;
SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000,
(PDWORD_PTR) &hIcon);
-
- if (!hIcon)
- SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000,
(PDWORD_PTR) &hIcon);
-
- if (!hIcon)
- SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000,
(PDWORD_PTR) &hIcon);
-
- if (!hIcon)
- hIcon = (HICON) GetClassLongPtr(hwnd, GCL_HICONSM);
-
- if (!hIcon)
- hIcon = (HICON) GetClassLongPtr(hwnd, GCL_HICON);
+ if (hIcon)
+ return hIcon;
+
+ SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000,
(PDWORD_PTR) &hIcon);
+ if (hIcon)
+ return hIcon;
+
+ SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000,
(PDWORD_PTR) &hIcon);
+ if (hIcon)
+ return hIcon;
+
+ hIcon = (HICON) GetClassLongPtr(hwnd, GCL_HICONSM);
+ if (hIcon)
+ return hIcon;
+
+ hIcon = (HICON) GetClassLongPtr(hwnd, GCL_HICON);
return hIcon;
}
+
INT UpdateTaskItemButton(IN PTASK_ITEM TaskItem)
{
TBBUTTONINFO tbbi;
@@ -447,23 +417,19 @@
/* Check if we're updating a button that is the last one in the
line. If so, we need to set the TBSTATE_WRAP flag! */
- if (TbButtonsPerLine != 0 &&
- (TaskItem->Index + 1) % TbButtonsPerLine == 0)
+ if (!Tray->IsHorizontal() || (TbButtonsPerLine != 0 &&
+ (TaskItem->Index + 1) % TbButtonsPerLine == 0))
{
tbbi.fsState |= TBSTATE_WRAP;
}
- tbbi.pszText = GetWndTextFromTaskItem(
- TaskItem);
+ tbbi.pszText = GetWndTextFromTaskItem(TaskItem);
icon = GetWndIcon(TaskItem->hWnd);
- TaskIcons->ReplaceIcon(TaskItem->IconIndex, icon,
&TaskItem->IconIndex);
+ TaskItem->IconIndex = ImageList_ReplaceIcon(TaskIcons, TaskItem->IconIndex,
icon);
tbbi.iImage = TaskItem->IconIndex;
- if (!SendMessage(hWndToolbar,
- TB_SETBUTTONINFO,
- (WPARAM) TaskItem->Index,
- (LPARAM) &tbbi))
+ if (!TaskBar.SetButtonInfo(TaskItem->Index, &tbbi))
{
TaskItem->Index = -1;
return -1;
@@ -473,8 +439,7 @@
return TaskItem->Index;
}
- VOID RemoveIcon(
- IN PTASK_ITEM TaskItem)
+ VOID RemoveIcon(IN PTASK_ITEM TaskItem)
{
TBBUTTONINFO tbbi;
PTASK_ITEM currentTaskItem, LastItem;
@@ -494,15 +459,12 @@
currentTaskItem->IconIndex--;
tbbi.iImage = currentTaskItem->IconIndex;
- SendMessage(hWndToolbar,
- TB_SETBUTTONINFO,
- currentTaskItem->Index,
- (LPARAM) &tbbi);
+ TaskBar.SetButtonInfo(currentTaskItem->Index, &tbbi);
}
currentTaskItem++;
}
- TaskIcons->Remove(TaskItem->IconIndex);
+ ImageList_Remove(TaskIcons, TaskItem->IconIndex);
}
PTASK_ITEM FindLastTaskItemOfGroup(
@@ -543,8 +505,7 @@
return FoundTaskItem;
}
- INT CalculateTaskItemNewButtonIndex(
- IN PTASK_ITEM TaskItem)
+ INT CalculateTaskItemNewButtonIndex(IN PTASK_ITEM TaskItem)
{
PTASK_GROUP TaskGroup;
PTASK_ITEM LastTaskItem;
@@ -561,9 +522,7 @@
if (TaskGroup->dwTaskCount > 1)
{
- LastTaskItem = FindLastTaskItemOfGroup(
- TaskGroup,
- TaskItem);
+ LastTaskItem = FindLastTaskItemOfGroup(TaskGroup, TaskItem);
if (LastTaskItem != NULL)
{
/* Since the group is expanded the task items must have an index
*/
@@ -577,9 +536,7 @@
{
/* Find the last NULL group button. NULL groups are added at the end of
the
task item list when grouping is enabled */
- LastTaskItem = FindLastTaskItemOfGroup(
- NULL,
- TaskItem);
+ LastTaskItem = FindLastTaskItemOfGroup(NULL, TaskItem);
if (LastTaskItem != NULL)
{
ASSERT(LastTaskItem->Index >= 0);
@@ -592,8 +549,7 @@
return ToolbarBtnCount;
}
- INT AddTaskItemButton(
- IN OUT PTASK_ITEM TaskItem)
+ INT AddTaskItemButton(IN OUT PTASK_ITEM TaskItem)
{
TBBUTTON tbBtn;
INT iIndex;
@@ -601,44 +557,36 @@
if (TaskItem->Index >= 0)
{
- return UpdateTaskItemButton(
- TaskItem);
+ return UpdateTaskItemButton(TaskItem);
}
if (TaskItem->Group != NULL &&
TaskItem->Group->IsCollapsed)
{
/* The task group is collapsed, we only need to update the group button */
- return UpdateTaskGroupButton(
- TaskItem->Group);
+ return UpdateTaskGroupButton(TaskItem->Group);
}
icon = GetWndIcon(TaskItem->hWnd);
- TaskIcons->ReplaceIcon(-1, icon, &TaskItem->IconIndex);
+ TaskItem->IconIndex = ImageList_ReplaceIcon(TaskIcons, -1, icon);
tbBtn.iBitmap = TaskItem->IconIndex;
tbBtn.fsState = TBSTATE_ENABLED | TBSTATE_ELLIPSES;
tbBtn.fsStyle = BTNS_CHECK | BTNS_NOPREFIX | BTNS_SHOWTEXT;
tbBtn.dwData = TaskItem->Index;
- tbBtn.iString = (DWORD_PTR) GetWndTextFromTaskItem(
- TaskItem);
+ tbBtn.iString = (DWORD_PTR) GetWndTextFromTaskItem(TaskItem);
/* Find out where to insert the new button */
- iIndex = CalculateTaskItemNewButtonIndex(
- TaskItem);
+ iIndex = CalculateTaskItemNewButtonIndex(TaskItem);
ASSERT(iIndex >= 0);
tbBtn.idCommand = iIndex;
- BeginUpdate();
-
- if (SendMessage(hWndToolbar,
- TB_INSERTBUTTON,
- (WPARAM) iIndex,
- (LPARAM) &tbBtn))
- {
- UpdateIndexesAfterButtonInserted(
- iIndex);
+ TaskBar.BeginUpdate();
+
+ if (TaskBar.InsertButton(iIndex, &tbBtn))
+ {
+ UpdateIndexesAfter(iIndex, TRUE);
TRACE("Added button %d for hwnd 0x%p\n", iIndex,
TaskItem->hWnd);
@@ -650,13 +598,12 @@
return iIndex;
}
- EndUpdate();
+ TaskBar.EndUpdate();
return -1;
}
- BOOL DeleteTaskItemButton(
- IN OUT PTASK_ITEM TaskItem)
+ BOOL DeleteTaskItemButton(IN OUT PTASK_ITEM TaskItem)
{
PTASK_GROUP TaskGroup;
INT iIndex;
@@ -668,36 +615,30 @@
if ((TaskGroup != NULL && !TaskGroup->IsCollapsed) ||
TaskGroup == NULL)
{
- BeginUpdate();
+ TaskBar.BeginUpdate();
RemoveIcon(TaskItem);
iIndex = TaskItem->Index;
- if (SendMessage(hWndToolbar,
- TB_DELETEBUTTON,
- (WPARAM) iIndex,
- 0))
+ if (TaskBar.DeleteButton(iIndex))
{
TaskItem->Index = -1;
ToolbarBtnCount--;
- UpdateIndexesAfterButtonDeleted(
- iIndex);
+ UpdateIndexesAfter(iIndex, FALSE);
/* Update button sizes and fix the button wrapping */
- UpdateButtonsSize(
- TRUE);
+ UpdateButtonsSize(TRUE);
return TRUE;
}
- EndUpdate();
+ TaskBar.EndUpdate();
}
}
return FALSE;
}
- PTASK_GROUP AddToTaskGroup(
- IN HWND hWnd)
+ PTASK_GROUP AddToTaskGroup(IN HWND hWnd)
{
DWORD dwProcessId;
PTASK_GROUP TaskGroup, *PrevLink;
@@ -741,8 +682,7 @@
return TaskGroup;
}
- VOID RemoveTaskFromTaskGroup(
- IN OUT PTASK_ITEM TaskItem)
+ VOID RemoveTaskFromTaskGroup(IN OUT PTASK_ITEM TaskItem)
{
PTASK_GROUP TaskGroup, CurrentGroup, *PrevLink;
@@ -777,21 +717,18 @@
{
/* FIXME: Check if we should expand the group */
/* Update the task group button */
- UpdateTaskGroupButton(
- TaskGroup);
+ UpdateTaskGroupButton(TaskGroup);
}
else
{
/* Expand the group of one task button to a task button */
- ExpandTaskGroup(
- TaskGroup);
- }
- }
- }
- }
-
- PTASK_ITEM FindTaskItem(
- IN HWND hWnd)
+ ExpandTaskGroup(TaskGroup);
+ }
+ }
+ }
+ }
+
+ PTASK_ITEM FindTaskItem(IN HWND hWnd)
{
PTASK_ITEM TaskItem, LastItem;
@@ -808,15 +745,13 @@
return NULL;
}
- PTASK_ITEM FindOtherTaskItem(
- IN HWND hWnd)
+ PTASK_ITEM FindOtherTaskItem(IN HWND hWnd)
{
PTASK_ITEM LastItem, TaskItem;
PTASK_GROUP TaskGroup;
DWORD dwProcessId;
- if (!GetWindowThreadProcessId(hWnd,
- &dwProcessId))
+ if (!GetWindowThreadProcessId(hWnd, &dwProcessId))
{
return NULL;
}
@@ -903,8 +838,7 @@
return TaskItems + TaskItemCount++;
}
- VOID FreeTaskItem(
- IN OUT PTASK_ITEM TaskItem)
+ VOID FreeTaskItem(IN OUT PTASK_ITEM TaskItem)
{
WORD wIndex;
@@ -922,27 +856,22 @@
TaskItemCount--;
}
- VOID DeleteTaskItem(
- IN OUT PTASK_ITEM TaskItem)
+ VOID DeleteTaskItem(IN OUT PTASK_ITEM TaskItem)
{
if (!IsDestroying)
{
/* Delete the task button from the toolbar */
- DeleteTaskItemButton(
- TaskItem);
+ DeleteTaskItemButton(TaskItem);
}
/* Remove the task from it's group */
- RemoveTaskFromTaskGroup(
- TaskItem);
+ RemoveTaskFromTaskGroup(TaskItem);
/* Free the task item */
- FreeTaskItem(
- TaskItem);
- }
-
- VOID CheckActivateTaskItem(
- IN OUT PTASK_ITEM TaskItem)
+ FreeTaskItem(TaskItem);
+ }
+
+ VOID CheckActivateTaskItem(IN OUT PTASK_ITEM TaskItem)
{
PTASK_ITEM CurrentTaskItem;
PTASK_GROUP TaskGroup = NULL;
@@ -1000,9 +929,7 @@
}
}
- PTASK_ITEM
- FindTaskItemByIndex(
- IN INT Index)
+ PTASK_ITEM FindTaskItemByIndex(IN INT Index)
{
PTASK_ITEM TaskItem, LastItem;
@@ -1019,9 +946,7 @@
return NULL;
}
- PTASK_GROUP
- FindTaskGroupByIndex(
- IN INT Index)
+ PTASK_GROUP FindTaskGroupByIndex(IN INT Index)
{
PTASK_GROUP CurrentGroup;
@@ -1055,13 +980,11 @@
sizeof(*TaskItem));
TaskItem->hWnd = hWnd;
TaskItem->Index = -1;
- TaskItem->Group = AddToTaskGroup(
- hWnd);
+ TaskItem->Group = AddToTaskGroup(hWnd);
if (!IsDestroying)
{
- AddTaskItemButton(
- TaskItem);
+ AddTaskItemButton(TaskItem);
}
}
}
@@ -1069,8 +992,7 @@
return TaskItem != NULL;
}
- BOOL ActivateTaskItem(
- IN OUT PTASK_ITEM TaskItem OPTIONAL)
+ BOOL ActivateTaskItem(IN OUT PTASK_ITEM TaskItem OPTIONAL)
{
if (TaskItem != NULL)
{
@@ -1082,8 +1004,7 @@
return FALSE;
}
- BOOL ActivateTask(
- IN HWND hWnd)
+ BOOL ActivateTask(IN HWND hWnd)
{
PTASK_ITEM TaskItem;
@@ -1092,12 +1013,10 @@
return ActivateTaskItem(NULL);
}
- TaskItem = FindTaskItem(
- hWnd);
+ TaskItem = FindTaskItem(hWnd);
if (TaskItem == NULL)
{
- TaskItem = FindOtherTaskItem(
- hWnd);
+ TaskItem = FindOtherTaskItem(hWnd);
}
if (TaskItem == NULL)
@@ -1109,18 +1028,15 @@
return ActivateTaskItem(TaskItem);
}
- BOOL DeleteTask(
- IN HWND hWnd)
+ BOOL DeleteTask(IN HWND hWnd)
{
PTASK_ITEM TaskItem;
- TaskItem = FindTaskItem(
- hWnd);
+ TaskItem = FindTaskItem(hWnd);
if (TaskItem != NULL)
{
TRACE("Delete window 0x%p on button %d\n", hWnd,
TaskItem->Index);
- DeleteTaskItem(
- TaskItem);
+ DeleteTaskItem(TaskItem);
return TRUE;
}
//else
@@ -1138,40 +1054,33 @@
CurrentTask = TaskItems + TaskItemCount;
do
{
- DeleteTaskItem(
- --CurrentTask);
+ DeleteTaskItem(--CurrentTask);
} while (CurrentTask != TaskItems);
}
}
- VOID FlashTaskItem(
- IN OUT PTASK_ITEM TaskItem)
+ VOID FlashTaskItem(IN OUT PTASK_ITEM TaskItem)
{
TaskItem->RenderFlashed = 1;
- UpdateTaskItemButton(
- TaskItem);
- }
-
- BOOL FlashTask(
- IN HWND hWnd)
+ UpdateTaskItemButton(TaskItem);
+ }
+
+ BOOL FlashTask(IN HWND hWnd)
{
PTASK_ITEM TaskItem;
- TaskItem = FindTaskItem(
- hWnd);
+ TaskItem = FindTaskItem(hWnd);
if (TaskItem != NULL)
{
TRACE("Flashing window 0x%p on button %d\n", hWnd,
TaskItem->Index);
- FlashTaskItem(
- TaskItem);
+ FlashTaskItem(TaskItem);
return TRUE;
}
return FALSE;
}
- VOID RedrawTaskItem(
- IN OUT PTASK_ITEM TaskItem)
+ VOID RedrawTaskItem(IN OUT PTASK_ITEM TaskItem)
{
PTASK_GROUP TaskGroup;
@@ -1180,8 +1089,7 @@
{
if (TaskGroup->IsCollapsed && TaskGroup->Index >= 0)
{
- UpdateTaskGroupButton(
- TaskGroup);
+ UpdateTaskGroupButton(TaskGroup);
}
else if (TaskItem->Index >= 0)
{
@@ -1192,59 +1100,24 @@
{
UpdateTaskItem:
TaskItem->RenderFlashed = 0;
- UpdateTaskItemButton(
- TaskItem);
- }
- }
-
-
- BOOL RedrawTask(
- IN HWND hWnd)
+ UpdateTaskItemButton(TaskItem);
+ }
+ }
+
+
+ BOOL RedrawTask(IN HWND hWnd)
{
PTASK_ITEM TaskItem;
- TaskItem = FindTaskItem(
- hWnd);
+ TaskItem = FindTaskItem(hWnd);
if (TaskItem != NULL)
{
- RedrawTaskItem(
- TaskItem);
+ RedrawTaskItem(TaskItem);
return TRUE;
}
return FALSE;
}
-
- INT UpdateTbButtonSpacing(
- IN BOOL bHorizontal,
- IN UINT uiRows,
- IN UINT uiBtnsPerLine)
- {
- TBMETRICS tbm;
-
- tbm.cbSize = sizeof(tbm);
- tbm.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING;
-
- tbm.cxBarPad = tbm.cyBarPad = 0;
-
- if (bHorizontal || uiBtnsPerLine > 1)
- tbm.cxButtonSpacing = (3 * GetSystemMetrics(SM_CXEDGE) / 2);
- else
- tbm.cxButtonSpacing = 0;
-
- if (!bHorizontal || uiRows > 1)
- tbm.cyButtonSpacing = (3 * GetSystemMetrics(SM_CYEDGE) / 2);
- else
- tbm.cyButtonSpacing = 0;
-
- SendMessage(hWndToolbar,
- TB_SETMETRICS,
- 0,
- (LPARAM) &tbm);
-
- return tbm.cxButtonSpacing;
- }
-
VOID UpdateButtonsSize(IN BOOL bRedrawDisabled)
{
@@ -1252,75 +1125,89 @@
UINT uiRows, uiMax, uiMin, uiBtnsPerLine, ui;
LONG NewBtnSize;
BOOL Horizontal;
- TBBUTTONINFO tbbi;
- TBMETRICS tbm;
-
- if (GetClientRect(&rcClient) &&
- !IsRectEmpty(&rcClient))
+
+ if (GetClientRect(&rcClient) && !IsRectEmpty(&rcClient))
{
if (ToolbarBtnCount > 0)
{
- ZeroMemory(&tbm, sizeof(tbm));
- tbm.cbSize = sizeof(tbm);
- tbm.dwMask = TBMF_BUTTONSPACING;
- SendMessage(hWndToolbar,
- TB_GETMETRICS,
- 0,
- (LPARAM) &tbm);
-
- uiRows = (rcClient.bottom + tbm.cyButtonSpacing) / (ButtonSize.cy +
tbm.cyButtonSpacing);
- if (uiRows == 0)
- uiRows = 1;
-
- uiBtnsPerLine = (ToolbarBtnCount + uiRows - 1) / uiRows;
-
Horizontal = Tray->IsHorizontal();
+ if (Horizontal)
+ {
+ DbgPrint("HORIZONTAL!\n");
+ TBMETRICS tbm = { 0 };
+ tbm.cbSize = sizeof(tbm);
+ tbm.dwMask = TBMF_BUTTONSPACING;
+ TaskBar.GetMetrics(&tbm);
+
+ uiRows = (rcClient.bottom + tbm.cyButtonSpacing) / (ButtonSize.cy +
tbm.cyButtonSpacing);
+ if (uiRows == 0)
+ uiRows = 1;
+
+ uiBtnsPerLine = (ToolbarBtnCount + uiRows - 1) / uiRows;
+ }
+ else
+ {
+ DbgPrint("VERTICAL!\n");
+ uiBtnsPerLine = 1;
+ uiRows = ToolbarBtnCount;
+ }
+
if (!bRedrawDisabled)
- BeginUpdate();
+ TaskBar.BeginUpdate();
/* We might need to update the button spacing */
- tbm.cxButtonSpacing = UpdateTbButtonSpacing(
- Horizontal,
- uiRows,
- uiBtnsPerLine);
-
- /* Calculate the ideal width and make sure it's within the allowed
range */
- NewBtnSize = (rcClient.right - (uiBtnsPerLine * tbm.cxButtonSpacing)) /
uiBtnsPerLine;
+ int cxButtonSpacing = TaskBar.UpdateTbButtonSpacing(
+ Horizontal, TaskBandTheme != NULL,
+ uiRows, uiBtnsPerLine);
/* Determine the minimum and maximum width of a button */
+ uiMin = GetSystemMetrics(SM_CXSIZE) + (2 * GetSystemMetrics(SM_CXEDGE));
if (Horizontal)
+ {
uiMax = GetSystemMetrics(SM_CXMINIMIZED);
+
+ /* Calculate the ideal width and make sure it's within the
allowed range */
+ NewBtnSize = (rcClient.right - (uiBtnsPerLine * cxButtonSpacing)) /
uiBtnsPerLine;
+
+ if (NewBtnSize < (LONG) uiMin)
+ NewBtnSize = uiMin;
+ if (NewBtnSize >(LONG)uiMax)
+ NewBtnSize = uiMax;
+
+ /* Recalculate how many buttons actually fit into one line */
+ uiBtnsPerLine = rcClient.right / (NewBtnSize + cxButtonSpacing);
+ if (uiBtnsPerLine == 0)
+ uiBtnsPerLine++;
+ }
else
- uiMax = rcClient.right;
-
- uiMin = GetSystemMetrics(SM_CXSIZE) + (2 * GetSystemMetrics(SM_CXEDGE));
-
- if (NewBtnSize < (LONG) uiMin)
- NewBtnSize = uiMin;
- if (NewBtnSize > (LONG)uiMax)
- NewBtnSize = uiMax;
+ {
+ NewBtnSize = uiMax = rcClient.right;
+ }
ButtonSize.cx = NewBtnSize;
- /* Recalculate how many buttons actually fit into one line */
- uiBtnsPerLine = rcClient.right / (NewBtnSize + tbm.cxButtonSpacing);
- if (uiBtnsPerLine == 0)
- uiBtnsPerLine++;
TbButtonsPerLine = uiBtnsPerLine;
- tbbi.cbSize = sizeof(tbbi);
- tbbi.dwMask = TBIF_BYINDEX | TBIF_SIZE | TBIF_STATE;
- tbbi.cx = (INT) NewBtnSize;
-
for (ui = 0; ui != ToolbarBtnCount; ui++)
{
+ TBBUTTONINFOW tbbi = { 0 };
+ tbbi.cbSize = sizeof(tbbi);
+ tbbi.dwMask = TBIF_BYINDEX | TBIF_SIZE | TBIF_STATE;
+ tbbi.cx = (INT) NewBtnSize;
tbbi.fsState = TBSTATE_ENABLED;
/* Check if we're updating a button that is the last one in the
line. If so, we need to set the TBSTATE_WRAP flag! */
- if ((ui + 1) % uiBtnsPerLine == 0)
+ if (Horizontal)
+ {
+ if ((ui + 1) % uiBtnsPerLine == 0)
+ tbbi.fsState |= TBSTATE_WRAP;
+ }
+ else
+ {
tbbi.fsState |= TBSTATE_WRAP;
+ }
if (ActiveTaskItem != NULL &&
ActiveTaskItem->Index == (INT)ui)
@@ -1328,33 +1215,19 @@
tbbi.fsState |= TBSTATE_CHECKED;
}
- SendMessage(hWndToolbar,
- TB_SETBUTTONINFO,
- (WPARAM) ui,
- (LPARAM) &tbbi);
- }
-
-#if 0
- /* FIXME: Force the window to the correct position in case some idiot
- did something to us */
- SetWindowPos(hWndToolbar,
- NULL,
- 0,
- 0,
- rcClient.right, /* FIXME */
- rcClient.bottom, /* FIXME */
- SWP_NOACTIVATE | SWP_NOZORDER);
-#endif
+ TaskBar.SetButtonInfo(ui, &tbbi);
+ }
}
else
{
TbButtonsPerLine = 0;
ButtonSize.cx = 0;
}
- }
-
- EndUpdate();
- }
+ }
+
+ // FIXME: This seems to be enabling redraws prematurely, but moving it to its
right place doesn't work!
+ TaskBar.EndUpdate();
+ }
BOOL CALLBACK EnumWindowsProc(IN HWND hWnd)
{
@@ -1377,8 +1250,7 @@
return TRUE;
}
- static BOOL CALLBACK s_EnumWindowsProc(IN HWND hWnd,
- IN LPARAM lParam)
+ static BOOL CALLBACK s_EnumWindowsProc(IN HWND hWnd, IN LPARAM lParam)
{
CTaskSwitchWnd * This = (CTaskSwitchWnd *) lParam;
@@ -1394,6 +1266,8 @@
LRESULT OnThemeChanged()
{
+ TRACE("OmThemeChanged\n");
+
if (TaskBandTheme)
CloseThemeData(TaskBandTheme);
@@ -1401,6 +1275,7 @@
TaskBandTheme = OpenThemeData(m_hWnd, L"TaskBand");
else
TaskBandTheme = NULL;
+
return TRUE;
}
@@ -1411,80 +1286,46 @@
LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
- hWndToolbar = CreateWindowEx(0,
- TOOLBARCLASSNAME,
- szRunningApps,
- WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN |
- TBSTYLE_TOOLTIPS | TBSTYLE_WRAPABLE | TBSTYLE_LIST | TBSTYLE_TRANSPARENT |
- CCS_TOP | CCS_NORESIZE | CCS_NODIVIDER,
- 0,
- 0,
- 0,
- 0,
- m_hWnd,
- NULL,
- hExplorerInstance,
- NULL);
-
- if (hWndToolbar != NULL)
- {
- HMODULE hShell32;
- SIZE BtnSize;
-
- TaskBar.SubclassWindow(hWndToolbar);
-
- SetWindowTheme(hWndToolbar, L"TaskBand", NULL);
- OnThemeChanged();
-
- /* Identify the version we're using */
- SendMessage(hWndToolbar,
- TB_BUTTONSTRUCTSIZE,
- sizeof(TBBUTTON),
- 0);
-
- TaskIcons = (IImageList*) ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 0,
1000);
- SendMessage(hWndToolbar, TB_SETIMAGELIST, 0, (LPARAM) TaskIcons);
-
- /* Calculate the default button size. Don't save this in ButtonSize.cx so
that
- the actual button width gets updated correctly on the first recalculation
*/
- BtnSize.cx = GetSystemMetrics(SM_CXMINIMIZED);
- ButtonSize.cy = BtnSize.cy = GetSystemMetrics(SM_CYSIZE) + (2 *
GetSystemMetrics(SM_CYEDGE));
- SendMessage(hWndToolbar, TB_SETBUTTONSIZE, 0, (LPARAM) MAKELONG(BtnSize.cx,
BtnSize.cy));
-
- /* We don't want to see partially clipped buttons...not that we could see
them... */
-#if 0
- SendMessage(hWndToolbar,
- TB_SETEXTENDEDSTYLE,
- 0,
- TBSTYLE_EX_HIDECLIPPEDBUTTONS);
-#endif
-
- /* Set proper spacing between buttons */
- UpdateTbButtonSpacing(Tray->IsHorizontal(), 0, 0);
-
- /* Register the shell hook */
- ShellHookMsg = RegisterWindowMessage(TEXT("SHELLHOOK"));
-
- DbgPrint("ShellHookMsg got assigned number %d\n", ShellHookMsg);
-
- hShell32 = GetModuleHandle(TEXT("SHELL32.DLL"));
- if (hShell32 != NULL)
- {
- REGSHELLHOOK RegShellHook;
-
- /* RegisterShellHook */
- RegShellHook = (REGSHELLHOOK) GetProcAddress(hShell32, (LPCSTR) ((LONG)
181));
- if (RegShellHook != NULL)
- {
- RegShellHook(m_hWnd, 3); /* 1 if no NT! We're targeting NT so we
don't care! */
- }
- }
-
- RefreshWindowList();
-
- /* Recalculate the button size */
- UpdateButtonsSize(FALSE);
- }
+ if (!TaskBar.Initialize(m_hWnd))
+ return FALSE;
+
+ SetWindowTheme(TaskBar.m_hWnd, L"TaskBand", NULL);
+ OnThemeChanged();
+
+ TaskIcons = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 0, 1000);
+ TaskBar.SetImageList(TaskIcons);
+
+ /* Calculate the default button size. Don't save this in ButtonSize.cx so
that
+ the actual button width gets updated correctly on the first recalculation */
+ int cx = GetSystemMetrics(SM_CXMINIMIZED);
+ int cy = ButtonSize.cy = GetSystemMetrics(SM_CYSIZE) + (2 *
GetSystemMetrics(SM_CYEDGE));
+ TaskBar.SetButtonSize(cx, cy);
+
+ /* Set proper spacing between buttons */
+ TaskBar.UpdateTbButtonSpacing(Tray->IsHorizontal(), TaskBandTheme != NULL);
+
+ /* Register the shell hook */
+ ShellHookMsg = RegisterWindowMessage(TEXT("SHELLHOOK"));
+
+ TRACE("ShellHookMsg got assigned number %d\n", ShellHookMsg);
+
+ HMODULE hShell32 = GetModuleHandle(TEXT("SHELL32.DLL"));
+ if (hShell32 != NULL)
+ {
+ REGSHELLHOOK RegShellHook;
+
+ /* RegisterShellHook */
+ RegShellHook = (REGSHELLHOOK) GetProcAddress(hShell32, (LPCSTR) ((LONG)
181));
+ if (RegShellHook != NULL)
+ {
+ RegShellHook(m_hWnd, 3); /* 1 if no NT! We're targeting NT so we
don't care! */
+ }
+ }
+
+ RefreshWindowList();
+
+ /* Recalculate the button size */
+ UpdateButtonsSize(FALSE);
#if DUMP_TASKS != 0
SetTimer(hwnd, 1, 5000, NULL);
@@ -1519,9 +1360,7 @@
return TRUE;
}
- BOOL HandleAppCommand(
- IN WPARAM wParam,
- IN LPARAM lParam)
+ BOOL HandleAppCommand(IN WPARAM wParam, IN LPARAM lParam)
{
BOOL Ret = FALSE;
@@ -1553,20 +1392,17 @@
return 0;
}
- DbgPrint("Received shell hook message: wParam=%08lx, lParam=%08lx\n",
wParam, lParam);
+ TRACE("Received shell hook message: wParam=%08lx, lParam=%08lx\n",
wParam, lParam);
switch ((INT) wParam)
{
case HSHELL_APPCOMMAND:
- HandleAppCommand(
- wParam,
- lParam);
+ HandleAppCommand(wParam, lParam);
Ret = TRUE;
break;
case HSHELL_WINDOWCREATED:
- Ret = AddTask(
- (HWND) lParam);
+ Ret = AddTask((HWND) lParam);
break;
case HSHELL_WINDOWDESTROYED:
@@ -1630,18 +1466,15 @@
return Ret;
}
- VOID EnableGrouping(
- IN BOOL bEnable)
+ VOID EnableGrouping(IN BOOL bEnable)
{
IsGroupingEnabled = bEnable;
/* Collapse or expand groups if neccessary */
- UpdateButtonsSize(
- FALSE);
- }
-
- VOID HandleTaskItemClick(
- IN OUT PTASK_ITEM TaskItem)
+ UpdateButtonsSize(FALSE);
+ }
+
+ VOID HandleTaskItemClick(IN OUT PTASK_ITEM TaskItem)
{
BOOL bIsMinimized;
BOOL bIsActive;
@@ -1683,14 +1516,12 @@
}
}
- VOID HandleTaskGroupClick(
- IN OUT PTASK_GROUP TaskGroup)
+ VOID HandleTaskGroupClick(IN OUT PTASK_GROUP TaskGroup)
{
/* TODO: Show task group menu */
}
- BOOL HandleButtonClick(
- IN WORD wIndex)
+ BOOL HandleButtonClick(IN WORD wIndex)
{
PTASK_ITEM TaskItem;
PTASK_GROUP TaskGroup;
@@ -1700,8 +1531,7 @@
TaskGroup = FindTaskGroupByIndex((INT) wIndex);
if (TaskGroup != NULL && TaskGroup->IsCollapsed)
{
- HandleTaskGroupClick(
- TaskGroup);
+ HandleTaskGroupClick(TaskGroup);
return TRUE;
}
}
@@ -1709,8 +1539,7 @@
TaskItem = FindTaskItemByIndex((INT) wIndex);
if (TaskItem != NULL)
{
- HandleTaskItemClick(
- TaskItem);
+ HandleTaskItemClick(TaskItem);
return TRUE;
}
@@ -1718,32 +1547,31 @@
}
- VOID HandleTaskItemRightClick(
- IN OUT PTASK_ITEM TaskItem)
+ VOID HandleTaskItemRightClick(IN OUT PTASK_ITEM TaskItem)
{
HMENU hmenu = GetSystemMenu(TaskItem->hWnd, FALSE);
- if (hmenu) {
+ if (hmenu)
+ {
POINT pt;
int cmd;
GetCursorPos(&pt);
- cmd = TrackPopupMenu(hmenu, TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_RETURNCMD,
pt.x, pt.y, 0, hWndToolbar, NULL);
- if (cmd) {
+ cmd = TrackPopupMenu(hmenu, TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_RETURNCMD,
pt.x, pt.y, 0, TaskBar.m_hWnd, NULL);
+ if (cmd)
+ {
SetForegroundWindow(TaskItem->hWnd); // reactivate window after the
context menu has closed
PostMessage(TaskItem->hWnd, WM_SYSCOMMAND, cmd, 0);
}
}
}
- VOID HandleTaskGroupRightClick(
- IN OUT PTASK_GROUP TaskGroup)
+ VOID HandleTaskGroupRightClick(IN OUT PTASK_GROUP TaskGroup)
{
/* TODO: Show task group right click menu */
}
- BOOL HandleButtonRightClick(
- IN WORD wIndex)
+ BOOL HandleButtonRightClick(IN WORD wIndex)
{
PTASK_ITEM TaskItem;
PTASK_GROUP TaskGroup;
@@ -1752,8 +1580,7 @@
TaskGroup = FindTaskGroupByIndex((INT) wIndex);
if (TaskGroup != NULL && TaskGroup->IsCollapsed)
{
- HandleTaskGroupRightClick(
- TaskGroup);
+ HandleTaskGroupRightClick(TaskGroup);
return TRUE;
}
}
@@ -1762,8 +1589,7 @@
if (TaskItem != NULL)
{
- HandleTaskItemRightClick(
- TaskItem);
+ HandleTaskItemRightClick(TaskItem);
return TRUE;
}
@@ -1828,8 +1654,7 @@
{
case CDDS_ITEMPREPAINT:
- Ret = HandleItemPaint(
- nmtbcd);
+ Ret = HandleItemPaint(nmtbcd);
break;
case CDDS_PREPAINT:
@@ -1876,18 +1701,11 @@
szClient.cx = LOWORD(lParam);
szClient.cy = HIWORD(lParam);
- if (hWndToolbar != NULL)
- {
- ::SetWindowPos(hWndToolbar,
- NULL,
- 0,
- 0,
- szClient.cx,
- szClient.cy,
- SWP_NOZORDER);
-
- UpdateButtonsSize(
- FALSE);
+ if (TaskBar.m_hWnd != NULL)
+ {
+ TaskBar.SetWindowPos(NULL, 0, 0, szClient.cx, szClient.cy, SWP_NOZORDER);
+
+ UpdateButtonsSize(FALSE);
}
return TRUE;
}
@@ -1926,10 +1744,9 @@
LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
LRESULT Ret = TRUE;
- if (lParam != 0 && (HWND) lParam == hWndToolbar)
- {
- HandleButtonClick(
- LOWORD(wParam));
+ if (lParam != 0 && (HWND) lParam == TaskBar.m_hWnd)
+ {
+ HandleButtonClick(LOWORD(wParam));
}
return Ret;
}
@@ -1939,10 +1756,9 @@
LRESULT Ret = TRUE;
const NMHDR *nmh = (const NMHDR *) lParam;
- if (nmh->hwndFrom == hWndToolbar)
- {
- Ret = HandleToolbarNotification(
- nmh);
+ if (nmh->hwndFrom == TaskBar.m_hWnd)
+ {
+ Ret = HandleToolbarNotification(nmh);
}
return Ret;
}
@@ -1960,37 +1776,27 @@
LRESULT OnUpdateTaskbarPos(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL&
bHandled)
{
/* Update the button spacing */
- UpdateTbButtonSpacing(
- Tray->IsHorizontal(),
- 0,
- 0);
+ TaskBar.UpdateTbButtonSpacing(Tray->IsHorizontal(), TaskBandTheme != NULL);
return TRUE;
}
LRESULT OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
LRESULT Ret;
- if (hWndToolbar != NULL)
+ if (TaskBar.m_hWnd != NULL)
{
POINT pt;
INT_PTR iBtn;
- pt.x = (LONG) LOWORD(lParam);
- pt.y = (LONG) HIWORD(lParam);
-
- MapWindowPoints(NULL,
- hWndToolbar,
- &pt,
- 1);
-
- iBtn = (INT_PTR) SendMessage(hWndToolbar,
- TB_HITTEST,
- 0,
- (LPARAM) &pt);
+ pt.x = GET_X_LPARAM(lParam);
+ pt.y = GET_Y_LPARAM(lParam);
+
+ ::ScreenToClient(TaskBar.m_hWnd, &pt);
+
+ iBtn = TaskBar.HitTest(&pt);
if (iBtn >= 0)
{
- HandleButtonRightClick(
- iBtn);
+ HandleButtonRightClick(iBtn);
}
else
goto ForwardContextMenuMsg;
@@ -1999,10 +1805,7 @@
{
ForwardContextMenuMsg:
/* Forward message */
- Ret = SendMessage(Tray->GetHWND(),
- uMsg,
- wParam,
- lParam);
+ Ret = SendMessage(Tray->GetHWND(), uMsg, wParam, lParam);
}
return Ret;
}
@@ -2014,8 +1817,8 @@
{
RECT* prcMinRect = (RECT*) lParam;
RECT rcItem, rcToolbar;
- SendMessageW(hWndToolbar, TB_GETITEMRECT, TaskItem->Index, (LPARAM)
&rcItem);
- GetWindowRect(hWndToolbar, &rcToolbar);
+ TaskBar.GetItemRect(TaskItem->Index, &rcItem);
+ GetWindowRect(TaskBar.m_hWnd, &rcToolbar);
OffsetRect(&rcItem, rcToolbar.left, rcToolbar.top);
Modified: branches/shell-experiments/base/shell/explorer-new/tbsite.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex…
==============================================================================
--- branches/shell-experiments/base/shell/explorer-new/tbsite.cpp [iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/explorer-new/tbsite.cpp [iso-8859-1] Wed Nov 5
22:58:53 2014
@@ -262,13 +262,10 @@
return E_FAIL;
/*TRACE("Calling IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p,
0x%p) hWndRebar=0x%p\n", hWnd, uMsg, wParam, lParam, plResult, hWndRebar);*/
- hRet = WindowEventHandler->OnWinEvent(
- hWnd,
- uMsg,
- wParam,
- lParam,
- plResult);
- if (FAILED_UNEXPECTEDLY(hRet))
+ hRet = WindowEventHandler->OnWinEvent(hWnd, uMsg, wParam, lParam, plResult);
+
+#if 0
+ if (FAILED(hRet))
{
if (uMsg == WM_NOTIFY)
{
@@ -280,6 +277,7 @@
ERR("ITrayBandSite->IWinEventHandler::ProcessMessage(0x%p,0x%x,0x%p,0x%p,0x%p->0x%p)
returned: 0x%x\n", hWnd, uMsg, wParam, lParam, plResult, *plResult, hRet);
}
}
+#endif
return hRet;
}
Modified: branches/shell-experiments/base/shell/explorer-new/trayntfy.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex…
==============================================================================
--- branches/shell-experiments/base/shell/explorer-new/trayntfy.cpp [iso-8859-1]
(original)
+++ branches/shell-experiments/base/shell/explorer-new/trayntfy.cpp [iso-8859-1] Wed Nov
5 22:58:53 2014
@@ -19,7 +19,9 @@
*/
#include "precomp.h"
-//#include <docobj.h>
+
+#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
+#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
/*
* SysPagerWnd
@@ -85,6 +87,13 @@
TBBUTTON tbBtn;
NOTIFYICONDATA * notifyItem;
WCHAR text [] = TEXT("");
+
+ int index = FindItemByIconData(iconData, ¬ifyItem);
+ if (index >= 0)
+ {
+ UpdateButton(iconData);
+ return;
+ }
notifyItem = new NOTIFYICONDATA();
ZeroMemory(notifyItem, sizeof(*notifyItem));
@@ -203,7 +212,7 @@
delete notifyItem;
}
- VOID GetTooltip(int index, LPTSTR szTip, DWORD cchTip)
+ VOID GetTooltipText(int index, LPTSTR szTip, DWORD cchTip)
{
NOTIFYICONDATA * notifyItem;
notifyItem = GetItemData(index);
@@ -242,7 +251,7 @@
if (uMsg >= WM_MOUSEFIRST && uMsg <= WM_MOUSELAST)
{
- DbgPrint("Sending message %S from button %d to %p (msg=%x, w=%x,
l=%x)...\n",
+ TRACE("Sending message %S from button %d to %p (msg=%x, w=%x,
l=%x)...\n",
eventNames[uMsg - WM_MOUSEFIRST], wIndex,
notifyItem->hWnd, notifyItem->uCallbackMessage,
notifyItem->uID, uMsg);
}
@@ -269,13 +278,9 @@
LRESULT OnMouseEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
- POINT pt;
- INT iBtn;
-
- pt.x = LOWORD(lParam);
- pt.y = HIWORD(lParam);
-
- iBtn = (INT) SendMessageW(TB_HITTEST, 0, (LPARAM) &pt);
+ POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
+
+ INT iBtn = HitTest(&pt);
if (iBtn >= 0)
{
@@ -285,10 +290,65 @@
bHandled = FALSE;
return FALSE;
}
+
+ LRESULT OnTooltipShow(INT uCode, LPNMHDR hdr, BOOL& bHandled)
+ {
+ RECT rcTip, rcItem;
+ GetWindowRect(hdr->hwndFrom, &rcTip);
+
+ SIZE szTip = { rcTip.right - rcTip.left, rcTip.bottom - rcTip.top };
+
+ INT iBtn = GetHotItem();
+
+ if (iBtn >= 0)
+ {
+ MONITORINFO monInfo = { 0 };
+ HMONITOR hMon = MonitorFromWindow(m_hWnd, MONITOR_DEFAULTTONEAREST);
+
+ monInfo.cbSize = sizeof(monInfo);
+
+ if (hMon)
+ GetMonitorInfo(hMon, &monInfo);
+ else
+ GetWindowRect(GetDesktopWindow(), &monInfo.rcMonitor);
+
+ GetItemRect(iBtn, &rcItem);
+
+ POINT ptItem = { rcItem.left, rcItem.top };
+ SIZE szItem = { rcItem.right - rcItem.left, rcItem.bottom - rcItem.top };
+ ClientToScreen(m_hWnd, &ptItem);
+
+ ptItem.x += szItem.cx / 2;
+ ptItem.y -= szTip.cy;
+
+ if (ptItem.x + szTip.cx > monInfo.rcMonitor.right)
+ ptItem.x = monInfo.rcMonitor.right - szTip.cx;
+
+ if (ptItem.y + szTip.cy > monInfo.rcMonitor.bottom)
+ ptItem.y = monInfo.rcMonitor.bottom - szTip.cy;
+
+ if (ptItem.x < monInfo.rcMonitor.left)
+ ptItem.x = monInfo.rcMonitor.left;
+
+ if (ptItem.y < monInfo.rcMonitor.top)
+ ptItem.y = monInfo.rcMonitor.top;
+
+ TRACE("ptItem { %d, %d }\n", ptItem.x, ptItem.y);
+
+ ::SetWindowPos(hdr->hwndFrom, NULL, ptItem.x, ptItem.y, 0, 0, SWP_NOSIZE |
SWP_NOZORDER | SWP_NOACTIVATE);
+
+ return TRUE;
+ }
+
+ bHandled = FALSE;
+ return 0;
+ }
+
public:
BEGIN_MSG_MAP(CNotifyToolbar)
MESSAGE_RANGE_HANDLER(WM_MOUSEFIRST, WM_MOUSELAST, OnMouseEvent)
+ NOTIFY_CODE_HANDLER(TTN_SHOW, OnTooltipShow)
END_MSG_MAP()
void Initialize(HWND hWndParent)
@@ -298,7 +358,7 @@
TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_WRAPABLE | TBSTYLE_TRANSPARENT |
CCS_TOP | CCS_NORESIZE | CCS_NOPARENTALIGN | CCS_NODIVIDER;
- Create(hWndParent, styles);
+ SubclassWindow(Create(hWndParent, styles));
SetWindowTheme(m_hWnd, L"TrayNotify", NULL);
@@ -398,7 +458,6 @@
void GetSize(IN WPARAM wParam, IN PSIZE size)
{
INT rows = 0;
- TBMETRICS tbm;
int VisibleButtonCount = Toolbar.GetVisibleButtonCount();
if (wParam) /* horizontal */
@@ -415,20 +474,12 @@
rows++;
size->cy = (VisibleButtonCount + rows - 1) / rows * 24;
}
-
- tbm.cbSize = sizeof(tbm);
- tbm.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING;
- tbm.cxBarPad = tbm.cyBarPad = 0;
- tbm.cxButtonSpacing = 0;
- tbm.cyButtonSpacing = 0;
-
- Toolbar.SetMetrics(&tbm);
}
LRESULT OnGetInfoTip(INT uCode, LPNMHDR hdr, BOOL& bHandled)
{
NMTBGETINFOTIPW * nmtip = (NMTBGETINFOTIPW *) hdr;
- Toolbar.GetTooltip(nmtip->iItem, nmtip->pszText, nmtip->cchTextMax);
+ Toolbar.GetTooltipText(nmtip->iItem, nmtip->pszText,
nmtip->cchTextMax);
return TRUE;
}
@@ -457,6 +508,15 @@
if (Toolbar)
{
+ TBMETRICS tbm;
+ tbm.cbSize = sizeof(tbm);
+ tbm.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING;
+ tbm.cxBarPad = tbm.cyBarPad = 0;
+ tbm.cxButtonSpacing = 0;
+ tbm.cyButtonSpacing = 0;
+
+ Toolbar.SetMetrics(&tbm);
+
Toolbar.SetWindowPos(NULL, 0, 0, szClient.cx, szClient.cy, SWP_NOZORDER);
Toolbar.AutoSize();
Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex…
==============================================================================
--- branches/shell-experiments/base/shell/explorer-new/traywnd.cpp [iso-8859-1]
(original)
+++ branches/shell-experiments/base/shell/explorer-new/traywnd.cpp [iso-8859-1] Wed Nov 5
22:58:53 2014
@@ -60,10 +60,10 @@
public ITrayWindow,
public IShellDesktopTray
{
+ CContainedWindow StartButton;
+
HTHEME TaskbarTheme;
HWND hWndDesktop;
-
- HWND hwndStart;
IImageList * himlStartBtn;
SIZE StartBtnSize;
@@ -120,9 +120,9 @@
public:
CTrayWindow() :
+ StartButton(this, 1),
TaskbarTheme(NULL),
hWndDesktop(NULL),
- hwndStart(NULL),
himlStartBtn(NULL),
hStartBtnFont(NULL),
hCaptionFont(NULL),
@@ -815,8 +815,7 @@
ResizeWorkArea();
- ApplyClipping(
- TRUE);
+ ApplyClipping(TRUE);
}
typedef struct _TW_STUCKRECTS2
@@ -1058,20 +1057,14 @@
SIZE Size = { 0, 0 };
if (himlStartBtn == NULL ||
- !SendMessage(hwndStart,
- BCM_GETIDEALSIZE,
- 0,
- (LPARAM) &Size))
+ !StartButton.SendMessage(BCM_GETIDEALSIZE, 0, (LPARAM) &Size))
{
Size.cx = GetSystemMetrics(SM_CXEDGE);
Size.cy = GetSystemMetrics(SM_CYEDGE);
if (hbmStart == NULL)
{
- hbmStart = (HBITMAP) SendMessage(hwndStart,
- BM_GETIMAGE,
- IMAGE_BITMAP,
- 0);
+ hbmStart = (HBITMAP) StartButton.SendMessage(BM_GETIMAGE, IMAGE_BITMAP,
0);
}
if (hbmStart != NULL)
@@ -1139,11 +1132,11 @@
if (StartSize.cx > rcClient.right)
StartSize.cx = rcClient.right;
- if (hwndStart != NULL)
+ if (StartButton.m_hWnd != NULL)
{
/* Resize and reposition the button */
dwp = DeferWindowPos(dwp,
- hwndStart,
+ StartButton.m_hWnd,
NULL,
0,
0,
@@ -1407,6 +1400,15 @@
else
TaskbarTheme = NULL;
+ if (TaskbarTheme)
+ {
+ SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, 0);
+ }
+ else
+ {
+ SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, WS_THICKFRAME |
WS_BORDER);
+ }
+
return TRUE;
}
@@ -1461,26 +1463,24 @@
}
/* Create the Start button */
- hwndStart = CreateWindowEx(0,
- WC_BUTTON,
- szStartCaption,
- WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS |
- BS_PUSHBUTTON | BS_CENTER | BS_VCENTER | BS_BITMAP,
- 0,
- 0,
- 0,
- 0,
- m_hWnd,
- (HMENU) IDC_STARTBTN,
- hExplorerInstance,
- NULL);
- if (hwndStart)
- {
- SetWindowTheme(hwndStart, L"Start", NULL);
- SendMessage(hwndStart,
- WM_SETFONT,
- (WPARAM) hStartBtnFont,
- FALSE);
+ StartButton.SubclassWindow(CreateWindowEx(
+ 0,
+ WC_BUTTON,
+ szStartCaption,
+ WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS |
+ BS_PUSHBUTTON | BS_CENTER | BS_VCENTER | BS_BITMAP,
+ 0,
+ 0,
+ 0,
+ 0,
+ m_hWnd,
+ (HMENU) IDC_STARTBTN,
+ hExplorerInstance,
+ NULL));
+ if (StartButton.m_hWnd)
+ {
+ SetWindowTheme(StartButton.m_hWnd, L"Start", NULL);
+ StartButton.SendMessage(WM_SETFONT, (WPARAM) hStartBtnFont, FALSE);
if (CreateStartBtnImageList())
{
@@ -1493,10 +1493,7 @@
bil.margin.top = bil.margin.bottom = 1;
bil.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT;
- if (!SendMessage(hwndStart,
- BCM_SETIMAGELIST,
- 0,
- (LPARAM) &bil))
+ if (!StartButton.SendMessage(BCM_SETIMAGELIST, 0, (LPARAM) &bil))
{
/* Fall back to the deprecated method on older systems that
don't
support Common Controls 6.0 */
@@ -1508,12 +1505,9 @@
/* We're using the image list, remove the BS_BITMAP style and
don't center it horizontally */
- SetWindowStyle(hwndStart,
- BS_BITMAP | BS_RIGHT,
- 0);
-
- UpdateStartButton(
- NULL);
+ SetWindowStyle(StartButton.m_hWnd, BS_BITMAP | BS_RIGHT, 0);
+
+ UpdateStartButton(NULL);
}
else
{
@@ -1523,13 +1517,9 @@
hbmStart = CreateStartButtonBitmap();
if (hbmStart != NULL)
{
- UpdateStartButton(
- hbmStart);
-
- hbmOld = (HBITMAP) SendMessage(hwndStart,
- BM_SETIMAGE,
- IMAGE_BITMAP,
- (LPARAM) hbmStart);
+ UpdateStartButton(hbmStart);
+
+ hbmOld = (HBITMAP) StartButton.SendMessage(BM_SETIMAGE, IMAGE_BITMAP,
(LPARAM) hbmStart);
if (hbmOld != NULL)
DeleteObject(hbmOld);
@@ -1657,7 +1647,7 @@
HWND hwnd;
RECT posRect;
- GetWindowRect(hwndStart, &posRect);
+ GetWindowRect(StartButton.m_hWnd, &posRect);
hwnd = CreateWindowEx(0,
WC_STATIC,
NULL,
@@ -1920,7 +1910,7 @@
HWND hwnd;
RECT posRect;
- GetWindowRect(hwndStart, &posRect);
+ GetWindowRect(StartButton.m_hWnd, &posRect);
hwnd = CreateWindowEx(0,
WC_STATIC,
@@ -1979,8 +1969,7 @@
RECTL rcExclude;
DWORD dwFlags = 0;
- if (GetWindowRect(hwndStart,
- (RECT*) &rcExclude))
+ if (GetWindowRect(StartButton.m_hWnd, (RECT*) &rcExclude))
{
switch (Position)
{
@@ -2007,7 +1996,7 @@
&rcExclude,
dwFlags);
- SendMessageW(hwndStart, BM_SETSTATE, TRUE, 0);
+ StartButton.SendMessageW(BM_SETSTATE, TRUE, 0);
}
}
}
@@ -2023,7 +2012,7 @@
GetWindowRect(m_hWnd, &rcCurrent);
over = PtInRect(&rcCurrent, pt);
- if (SendMessage(hwndStart, BM_GETSTATE, 0, 0) != BST_UNCHECKED)
+ if (StartButton.SendMessage( BM_GETSTATE, 0, 0) != BST_UNCHECKED)
{
over = TRUE;
}
@@ -2434,7 +2423,7 @@
uId = TrackMenu(
hSysMenu,
NULL,
- hwndStart,
+ StartButton.m_hWnd,
Position != ABE_TOP,
FALSE);
if (uId != 0)
@@ -2483,16 +2472,13 @@
if (pt.x != -1 || pt.y != -1)
ppt = &pt;
else
- hWndExclude = hwndStart;
-
- if ((HWND) wParam == hwndStart)
+ hWndExclude = StartButton.m_hWnd;
+
+ if ((HWND) wParam == StartButton.m_hWnd)
{
/* Make sure we can't track the context menu if the start
menu is currently being shown */
- if (!(SendMessage(hwndStart,
- BM_GETSTATE,
- 0,
- 0) & BST_PUSHED))
+ if (!(StartButton.SendMessage(BM_GETSTATE, 0, 0) & BST_PUSHED))
{
TrackCtxMenu(
&StartMenuBtnCtxMenu,
@@ -2511,27 +2497,18 @@
POINT ptClient = *ppt;
/* Convert the coordinates to client-coordinates */
- MapWindowPoints(NULL,
- m_hWnd,
- &ptClient,
- 1);
-
- hWndAtPt = ChildWindowFromPoint(m_hWnd,
- ptClient);
+ MapWindowPoints(NULL, m_hWnd, &ptClient, 1);
+
+ hWndAtPt = ChildWindowFromPoint(m_hWnd, ptClient);
if (hWndAtPt != NULL &&
(hWndAtPt == hwndRebar || IsChild(hwndRebar,
hWndAtPt)))
{
/* Check if the user clicked on the task switch window */
ptClient = *ppt;
- MapWindowPoints(NULL,
- hwndRebar,
- &ptClient,
- 1);
-
- hWndAtPt = ChildWindowFromPointEx(hwndRebar,
- ptClient,
- CWP_SKIPINVISIBLE |
CWP_SKIPDISABLED);
+ MapWindowPoints(NULL, hwndRebar, &ptClient, 1);
+
+ hWndAtPt = ChildWindowFromPointEx(hwndRebar, ptClient,
CWP_SKIPINVISIBLE | CWP_SKIPDISABLED);
if (hWndAtPt == hwndTaskSwitch)
goto HandleTrayContextMenu;
@@ -2572,7 +2549,7 @@
return Ret;
}
- if (TrayBandSite == NULL || FAILED_UNEXPECTEDLY(hr))
+ if (TrayBandSite == NULL || FAILED(hr))
{
const NMHDR *nmh = (const NMHDR *) lParam;
@@ -2628,7 +2605,7 @@
}
else
{
- SendMessage(m_hWnd, WM_COMMAND, MAKEWPARAM(BN_CLICKED, IDC_STARTBTN),
reinterpret_cast<LPARAM>(hwndStart));
+ PopupStartMenu();
}
return TRUE;
@@ -2638,7 +2615,7 @@
{
LRESULT Ret = FALSE;
- if ((HWND) lParam == hwndStart)
+ if ((HWND) lParam == StartButton.m_hWnd)
{
PopupStartMenu();
return FALSE;
@@ -2801,9 +2778,7 @@
Msg.wParam = wParam;
Msg.lParam = lParam;
- if (StartMenuBand->TranslateMenuMessage(
- &Msg,
- &lRet) == S_OK)
+ if (StartMenuBand->TranslateMenuMessage(&Msg, &lRet) == S_OK)
{
return lRet;
}
@@ -2812,32 +2787,33 @@
lParam = Msg.lParam;
}
MESSAGE_HANDLER(WM_THEMECHANGED, OnThemeChanged)
- NOTIFY_CODE_HANDLER(RBN_AUTOSIZE, OnRebarAutoSize) // Doesn't quite work
;P
- MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground)
- MESSAGE_HANDLER(WM_SIZE, OnSize)
- MESSAGE_HANDLER(WM_CREATE, OnCreate)
- /*MESSAGE_HANDLER(WM_DESTROY, OnDestroy)*/
- MESSAGE_HANDLER(WM_NCHITTEST, OnNcHitTest)
- MESSAGE_HANDLER(WM_COMMAND, OnCommand)
- MESSAGE_HANDLER(WM_NOTIFY, OnNotify)
- MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu)
- MESSAGE_HANDLER(WM_TIMER, OnTimer)
- MESSAGE_HANDLER(WM_DISPLAYCHANGE, OnDisplayChange)
- MESSAGE_HANDLER(WM_COPYDATA, OnCopyData)
- MESSAGE_HANDLER(WM_NCPAINT, OnNcPaint)
- MESSAGE_HANDLER(WM_CTLCOLORBTN, OnCtlColorBtn)
- MESSAGE_HANDLER(WM_MOVING, OnMoving)
- MESSAGE_HANDLER(WM_SIZING, OnSizing)
- MESSAGE_HANDLER(WM_WINDOWPOSCHANGING, OnWindowPosChange)
- MESSAGE_HANDLER(WM_ENTERSIZEMOVE, OnEnterSizeMove)
- MESSAGE_HANDLER(WM_EXITSIZEMOVE, OnExitSizeMove)
- MESSAGE_HANDLER(WM_SYSCHAR, OnSysChar)
- MESSAGE_HANDLER(WM_NCRBUTTONUP, OnNcRButtonUp)
- MESSAGE_HANDLER(WM_NCLBUTTONDBLCLK, OnNcLButtonDblClick)
- MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove)
- MESSAGE_HANDLER(WM_NCMOUSEMOVE, OnMouseMove)
- MESSAGE_HANDLER(WM_APP_TRAYDESTROY, OnAppTrayDestroy)
- MESSAGE_HANDLER(TWM_OPENSTARTMENU, OnOpenStartMenu)
+ NOTIFY_CODE_HANDLER(RBN_AUTOSIZE, OnRebarAutoSize) // Doesn't quite work ;P
+ MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground)
+ MESSAGE_HANDLER(WM_SIZE, OnSize)
+ MESSAGE_HANDLER(WM_CREATE, OnCreate)
+ /*MESSAGE_HANDLER(WM_DESTROY, OnDestroy)*/
+ MESSAGE_HANDLER(WM_NCHITTEST, OnNcHitTest)
+ MESSAGE_HANDLER(WM_COMMAND, OnCommand)
+ MESSAGE_HANDLER(WM_NOTIFY, OnNotify)
+ MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu)
+ MESSAGE_HANDLER(WM_TIMER, OnTimer)
+ MESSAGE_HANDLER(WM_DISPLAYCHANGE, OnDisplayChange)
+ MESSAGE_HANDLER(WM_COPYDATA, OnCopyData)
+ MESSAGE_HANDLER(WM_NCPAINT, OnNcPaint)
+ MESSAGE_HANDLER(WM_CTLCOLORBTN, OnCtlColorBtn)
+ MESSAGE_HANDLER(WM_MOVING, OnMoving)
+ MESSAGE_HANDLER(WM_SIZING, OnSizing)
+ MESSAGE_HANDLER(WM_WINDOWPOSCHANGING, OnWindowPosChange)
+ MESSAGE_HANDLER(WM_ENTERSIZEMOVE, OnEnterSizeMove)
+ MESSAGE_HANDLER(WM_EXITSIZEMOVE, OnExitSizeMove)
+ MESSAGE_HANDLER(WM_SYSCHAR, OnSysChar)
+ MESSAGE_HANDLER(WM_NCRBUTTONUP, OnNcRButtonUp)
+ MESSAGE_HANDLER(WM_NCLBUTTONDBLCLK, OnNcLButtonDblClick)
+ MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove)
+ MESSAGE_HANDLER(WM_NCMOUSEMOVE, OnMouseMove)
+ MESSAGE_HANDLER(WM_APP_TRAYDESTROY, OnAppTrayDestroy)
+ MESSAGE_HANDLER(TWM_OPENSTARTMENU, OnOpenStartMenu)
+ ALT_MSG_MAP(1)
END_MSG_MAP()
/*
@@ -2959,10 +2935,7 @@
while (1)
{
- Ret = GetMessage(&Msg,
- NULL,
- 0,
- 0);
+ Ret = GetMessage(&Msg, NULL, 0, 0);
if (!Ret || Ret == -1)
break;
@@ -3026,7 +2999,7 @@
virtual HRESULT RaiseStartButton()
{
- SendMessageW(hwndStart, BM_SETSTATE, FALSE, 0);
+ StartButton.SendMessageW(BM_SETSTATE, FALSE, 0);
return S_OK;
}
Modified: branches/shell-experiments/include/reactos/rosctrls.h
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react…
==============================================================================
--- branches/shell-experiments/include/reactos/rosctrls.h [iso-8859-1] (original)
+++ branches/shell-experiments/include/reactos/rosctrls.h [iso-8859-1] Wed Nov 5 22:58:53
2014
@@ -197,9 +197,9 @@
};
-template<typename TItemData>
+template<typename TItemData = DWORD_PTR>
class CToolbar :
- public CWindow
+ public CWindowImplBaseT<CWindow>
{
public: // Configuration methods
@@ -215,15 +215,11 @@
dwExStyles = WS_EX_TOOLWINDOW;
}
- m_hWnd = CreateWindowEx(dwExStyles,
+ m_hWnd = CreateWindowExW(dwExStyles,
TOOLBARCLASSNAME,
NULL,
dwStyles,
- 0,
- 0,
- 0,
- 0,
- hWndParent,
+ 0, 0, 0, 0, hWndParent,
NULL,
_AtlBaseModule.GetModuleInstance(),
NULL);
@@ -242,6 +238,21 @@
return SendMessageW(TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
}
+ HWND GetTooltip()
+ {
+ return (HWND)SendMessageW(TB_GETTOOLTIPS);
+ }
+
+ DWORD SetTooltip(HWND hWndTooltip)
+ {
+ return SendMessageW(TB_SETTOOLTIPS, hWndTooltip, 0);
+ }
+
+ INT GetHotItem()
+ {
+ return SendMessageW(TB_GETHOTITEM);
+ }
+
public: // Button list management methods
int GetButtonCount()
{
@@ -299,15 +310,36 @@
return SendMessageW(TB_AUTOSIZE);
}
+ DWORD GetMetrics(TBMETRICS * tbm)
+ {
+ return SendMessageW(TB_GETMETRICS, 0, (LPARAM) tbm);
+ }
+
+ DWORD SetMetrics(TBMETRICS * tbm)
+ {
+ return SendMessageW(TB_SETMETRICS, 0, (LPARAM) tbm);
+ }
+
+ DWORD GetItemRect(int index, LPRECT prcItem)
+ {
+ return SendMessageW(TB_GETITEMRECT, index, (LPARAM) prcItem);
+ }
+
+ DWORD SetRedraw(BOOL bEnable)
+ {
+ return SendMessageW(WM_SETREDRAW, bEnable);
+ }
+
public: // Image list management methods
DWORD SetImageList(HIMAGELIST himl)
{
return SendMessageW(TB_SETIMAGELIST, 0, (LPARAM) himl);
}
- DWORD SetMetrics(TBMETRICS * tbm)
- {
- return SendMessageW(TB_SETMETRICS, 0, (LPARAM) tbm);
+public: // Other methods
+ INT HitTest(PPOINT ppt)
+ {
+ return (INT) SendMessageW(TB_HITTEST, 0, (LPARAM) ppt);
}
public: // Utility methods