Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 01:15:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EXPLORER_NEW]

Browse source 
- Restructure TaskSwitchWnd_CheckActivateTaskItem. No logic change intended.

svn path=/trunk/; revision=58192
This commit is contained in:
Thomas Faber 2013-01-18 23:34:51 +00:00
parent de76dbe73f
commit f70cfa3c30
1 changed files with 36 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
reactos/base/shell/explorer-new/taskswnd.c
View file

@ -945,58 +945,49 @@ TaskSwitchWnd_CheckActivateTaskItem(IN OUT PTASK_SWITCH_WND This,
if (TaskItem != NULL) if (TaskItem != NULL)
TaskGroup = TaskItem->Group; TaskGroup = TaskItem->Group;
if (This->IsGroupingEnabled && TaskGroup != NULL) if (This->IsGroupingEnabled &&
TaskGroup != NULL &&
TaskGroup->IsCollapsed)
{ {
if (TaskGroup->IsCollapsed) /* FIXME */
return;
}
if (ActiveTaskItem != NULL)
{
PTASK_GROUP ActiveTaskGroup;
if (ActiveTaskItem == TaskItem)
return;
ActiveTaskGroup = ActiveTaskItem->Group;
if (This->IsGroupingEnabled &&
ActiveTaskGroup != NULL &&
ActiveTaskGroup->IsCollapsed)
{ {
if (ActiveTaskGroup == TaskGroup)
return;
/* FIXME */ /* FIXME */
} }
else else
goto ChangeTaskItemButton; {
This->ActiveTaskItem = NULL;
if (ActiveTaskItem->Index >= 0)
{
TaskSwitchWnd_UpdateTaskItemButton(This,
ActiveTaskItem);
}
}
} }
else
This->ActiveTaskItem = TaskItem;
if (TaskItem != NULL && TaskItem->Index >= 0)
{ {
ChangeTaskItemButton: TaskSwitchWnd_UpdateTaskItemButton(This,
if (ActiveTaskItem != NULL) TaskItem);
{
PTASK_GROUP ActiveTaskGroup;
if (ActiveTaskItem == TaskItem)
return;
ActiveTaskGroup = ActiveTaskItem->Group;
if (This->IsGroupingEnabled && ActiveTaskGroup != NULL)
{
if (ActiveTaskGroup->IsCollapsed)
{
if (ActiveTaskGroup == TaskGroup)
return;
/* FIXME */
}
else
goto ChangeActiveTaskItemButton;
}
else
{
ChangeActiveTaskItemButton:
This->ActiveTaskItem = NULL;
if (ActiveTaskItem->Index >= 0)
{
TaskSwitchWnd_UpdateTaskItemButton(This,
ActiveTaskItem);
}
}
}
This->ActiveTaskItem = TaskItem;
if (TaskItem != NULL && TaskItem->Index >= 0)
{
TaskSwitchWnd_UpdateTaskItemButton(This,
TaskItem);
}
} }
} }