diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_app/src/clcutils.cpp | 53 | ||||
| -rw-r--r-- | src/mir_app/src/clistgroups.cpp | 2 |
2 files changed, 27 insertions, 28 deletions
diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp index a34841db82..4626c91e14 100644 --- a/src/mir_app/src/clcutils.cpp +++ b/src/mir_app/src/clcutils.cpp @@ -779,40 +779,39 @@ void fnLoadClcOptions(HWND hwnd, ClcData *dat, BOOL bFirst) SendMessage(hwnd, WM_SIZE, 0, 0);
}
-#define GSIF_HASMEMBERS 0x80000000
-#define GSIF_ALLCHECKED 0x40000000
-#define GSIF_INDEXMASK 0x3FFFFFFF
+///////////////////////////////////////////////////////////////////////////////
+// contact checkboxes processing
-MIR_APP_DLL(void) Clist_RecalculateGroupCheckboxes(ClcData *dat)
+static int GroupHasCheck(ClcGroup *group)
{
- ClcGroup *group = &dat->list;
- group->scanIndex = GSIF_ALLCHECKED;
- for (;;) {
- if ((group->scanIndex & GSIF_INDEXMASK) == group->cl.getCount()) {
- int check = (group->scanIndex & (GSIF_HASMEMBERS | GSIF_ALLCHECKED)) == (GSIF_HASMEMBERS | GSIF_ALLCHECKED);
- if (group->parent == nullptr)
- break;
- group->parent->scanIndex |= group->scanIndex & GSIF_HASMEMBERS;
- group = group->parent;
- if (check)
- group->cl[(group->scanIndex & GSIF_INDEXMASK)]->flags |= CONTACTF_CHECKED;
+ bool bAllChecked = true, bHasMembers = false;
+
+ for (auto &cc: group->cl) {
+ if (cc->type == CLCIT_GROUP) {
+ int res = GroupHasCheck(cc->group);
+ if (res == 3)
+ cc->flags |= CONTACTF_CHECKED;
else {
- group->cl[(group->scanIndex & GSIF_INDEXMASK)]->flags &= ~CONTACTF_CHECKED;
- group->scanIndex &= ~GSIF_ALLCHECKED;
+ cc->flags &= ~CONTACTF_CHECKED;
+ bAllChecked = false;
}
+
+ if (res & 1)
+ bHasMembers = true;
}
- else if (group->cl[(group->scanIndex & GSIF_INDEXMASK)]->type == CLCIT_GROUP) {
- group = group->cl[(group->scanIndex & GSIF_INDEXMASK)]->group;
- group->scanIndex = GSIF_ALLCHECKED;
- continue;
- }
- else if (group->cl[(group->scanIndex & GSIF_INDEXMASK)]->type == CLCIT_CONTACT) {
- group->scanIndex |= GSIF_HASMEMBERS;
- if (!(group->cl[(group->scanIndex & GSIF_INDEXMASK)]->flags & CONTACTF_CHECKED))
- group->scanIndex &= ~GSIF_ALLCHECKED;
+ else if (cc->type == CLCIT_CONTACT) {
+ bHasMembers = true;
+ if (!(cc->flags & CONTACTF_CHECKED))
+ bAllChecked = false;
}
- group->scanIndex++;
}
+
+ return (bAllChecked ? 2 : 0) + (bHasMembers ? 1 : 0);
+}
+
+MIR_APP_DLL(void) Clist_RecalculateGroupCheckboxes(ClcData *dat)
+{
+ GroupHasCheck(&dat->list);
}
void fnSetContactCheckboxes(ClcContact *cc, int checked)
diff --git a/src/mir_app/src/clistgroups.cpp b/src/mir_app/src/clistgroups.cpp index d3d1650c63..acb0eb0632 100644 --- a/src/mir_app/src/clistgroups.cpp +++ b/src/mir_app/src/clistgroups.cpp @@ -110,7 +110,7 @@ MIR_APP_DLL(MGROUP) Clist_GroupExists(LPCTSTR ptszGroupName) void Clist_RebuildGroups(HWND hwnd, ClcData *dat)
{
for (auto &it: arByIds)
- if (!it->bHidden)
+ if (hwnd != g_clistApi.hwndContactTree || !it->bHidden)
g_clistApi.pfnAddGroup(hwnd, dat, it->groupName, it->flags, it->groupId+1, 0);
}
|