diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-12-29 17:03:21 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-12-29 17:03:21 +0300 |
| commit | 9536e0bb47b12ea2ae01ab070dd9f6aa5bb360c2 (patch) | |
| tree | a6663fa7d5aa9afcb51fe1b914e457acdcf5fa8f /plugins/FloatingContacts | |
| parent | 28535b12d00c1ccfa98250dd2c7e87402545adba (diff) | |
fixes #4085 (Удалить настройки невидимости)
Diffstat (limited to 'plugins/FloatingContacts')
| -rw-r--r-- | plugins/FloatingContacts/src/main.cpp | 2 | ||||
| -rw-r--r-- | plugins/FloatingContacts/src/thumbs.cpp | 28 |
2 files changed, 2 insertions, 28 deletions
diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index a1265dba97..21ae19ad5f 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -228,8 +228,6 @@ static int OnContactSettingChanged(WPARAM hContact, LPARAM lParam) // Only on these 2 events we need to refresh
if (0 == strcmp(pdbcws->szSetting, "Status"))
idStatus = pdbcws->value.wVal;
- else if (0 == strcmp(pdbcws->szSetting, "ApparentMode"))
- idStatus = GetContactStatus(hContact);
else if (0 == strcmp(pdbcws->szSetting, "Nick"))
idStatus = GetContactStatus(hContact);
else if (0 == strcmp(pdbcws->szSetting, "MyHandle"))
diff --git a/plugins/FloatingContacts/src/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp index 51e7e5d3cd..39da92f65f 100644 --- a/plugins/FloatingContacts/src/thumbs.cpp +++ b/plugins/FloatingContacts/src/thumbs.cpp @@ -247,18 +247,8 @@ void ThumbInfo::ResizeThumb() if (Contact::OnList(hContact)) {
char *szProto = Proto_GetBaseAccountName(hContact);
if (nullptr != szProto) {
- int nStatus = Proto_GetStatus(szProto);
int nContactStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
- int nApparentMode = db_get_w(hContact, szProto, "ApparentMode", 0);
-
- if ((nStatus == ID_STATUS_INVISIBLE && nApparentMode == ID_STATUS_ONLINE) ||
- (nStatus != ID_STATUS_INVISIBLE && nApparentMode == ID_STATUS_OFFLINE)) {
- if (ID_STATUS_OFFLINE == nContactStatus)
- index = FLT_FONTID_OFFINVIS;
- else
- index = FLT_FONTID_INVIS;
- }
- else if (ID_STATUS_OFFLINE == nContactStatus)
+ if (ID_STATUS_OFFLINE == nContactStatus)
index = FLT_FONTID_OFFLINE;
else
index = FLT_FONTID_CONTACTS;
@@ -575,23 +565,9 @@ void ThumbInfo::UpdateContent() if (Contact::OnList(hContact)) {
char *szProto = Proto_GetBaseAccountName(hContact);
if (nullptr != szProto) {
- int nStatus = Proto_GetStatus(szProto);
int nContactStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
- int nApparentMode = db_get_w(hContact, szProto, "ApparentMode", 0);
-
- if ((nStatus == ID_STATUS_INVISIBLE && nApparentMode == ID_STATUS_ONLINE) ||
- (nStatus != ID_STATUS_INVISIBLE && nApparentMode == ID_STATUS_OFFLINE)) {
- if (ID_STATUS_OFFLINE == nContactStatus)
- index = FLT_FONTID_OFFINVIS;
- else {
- index = FLT_FONTID_INVIS;
- if (fcOpt.bShowIdle && db_get_dw(hContact, szProto, "IdleTS", 0))
- fStyle |= ILD_BLEND50;
- }
- }
- else if (ID_STATUS_OFFLINE == nContactStatus) {
+ if (ID_STATUS_OFFLINE == nContactStatus)
index = FLT_FONTID_OFFLINE;
- }
else {
index = FLT_FONTID_CONTACTS;
if (fcOpt.bShowIdle && db_get_dw(hContact, szProto, "IdleTS", 0))
|