From a00c17f7006f7a001757cf952ae4ed87b5a328dd Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 29 Oct 2024 11:28:35 +0300 Subject: code cleaning --- plugins/Clist_nicer/src/clc.h | 6 ------ plugins/Clist_nicer/src/clcpaint.cpp | 8 ++------ 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'plugins/Clist_nicer') diff --git a/plugins/Clist_nicer/src/clc.h b/plugins/Clist_nicer/src/clc.h index 0c0f7c0039..52c2d6b47d 100644 --- a/plugins/Clist_nicer/src/clc.h +++ b/plugins/Clist_nicer/src/clc.h @@ -45,12 +45,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define TIMERID_REFRESH 18 #define TIMERID_PAINT 19 -#define CONTACTF_ONLINE 1 -//#define CONTACTF_INVISTO 2 -//#define CONTACTF_VISTO 4 -#define CONTACTF_NOTONLIST 8 -#define CONTACTF_CHECKED 16 -#define CONTACTF_IDLE 32 #define CONTACTF_STICKY 64 #define CONTACTF_PRIORITY 128 diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp index 5d71b1d53a..802a786e74 100644 --- a/plugins/Clist_nicer/src/clcpaint.cpp +++ b/plugins/Clist_nicer/src/clcpaint.cpp @@ -127,8 +127,7 @@ int GetBasicFontID(ClcContact *contact) if (contact->flags & CONTACTF_NOTONLIST) return FONTID_NOTONLIST; - if ((contact->flags & CONTACTF_INVISTO && Clist_GetRealStatus(contact, ID_STATUS_OFFLINE) != ID_STATUS_INVISIBLE) - || (contact->flags & CONTACTF_VISTO && Clist_GetRealStatus(contact, ID_STATUS_OFFLINE) == ID_STATUS_INVISIBLE)) + if (Clist_AltVisible(contact)) return contact->flags & CONTACTF_ONLINE ? FONTID_INVIS : FONTID_OFFINVIS; return contact->flags & CONTACTF_ONLINE ? FONTID_CONTACTS : FONTID_OFFLINE; @@ -430,11 +429,8 @@ set_bg_l: } else if (type == CLCIT_CONTACT && flags & CONTACTF_NOTONLIST) ChangeToFont(hdcMem, dat, FONTID_NOTONLIST, &fontHeight); - else if (type == CLCIT_CONTACT && ((flags & CONTACTF_INVISTO && Clist_GetRealStatus(contact, my_status) != ID_STATUS_INVISIBLE) || (flags & CONTACTF_VISTO && Clist_GetRealStatus(contact, my_status) == ID_STATUS_INVISIBLE))) { - // the contact is in the always visible list and the proto is invisible - // the contact is in the always invisible and the proto is in any other mode + else if (type == CLCIT_CONTACT && Clist_AltVisible(contact)) ChangeToFont(hdcMem, dat, flags & CONTACTF_ONLINE ? FONTID_INVIS : FONTID_OFFINVIS, &fontHeight); - } else if (type == CLCIT_CONTACT && !(flags & CONTACTF_ONLINE)) ChangeToFont(hdcMem, dat, FONTID_OFFLINE, &fontHeight); else -- cgit v1.2.3