diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-03-08 11:38:15 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-03-08 11:38:15 +0000 |
| commit | c4c02e49eddd09393cafb55513f5067b5810c1c9 (patch) | |
| tree | 523ef5e67843a69da8e631b63fc3f9f48812a0e6 /plugins/Clist_nicer/src/rowheight_funcs.cpp | |
| parent | f0c76b4878c08404b54ed8b5cc6f43b9da63769b (diff) | |
old ugly floating contacts removed from clist_nicer, the FloatingContacts plugin should be used instead from now on
git-svn-id: http://svn.miranda-ng.org/main/trunk@3919 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_nicer/src/rowheight_funcs.cpp')
| -rw-r--r-- | plugins/Clist_nicer/src/rowheight_funcs.cpp | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/plugins/Clist_nicer/src/rowheight_funcs.cpp b/plugins/Clist_nicer/src/rowheight_funcs.cpp index 918d600348..d3c9d52589 100644 --- a/plugins/Clist_nicer/src/rowheight_funcs.cpp +++ b/plugins/Clist_nicer/src/rowheight_funcs.cpp @@ -265,23 +265,6 @@ int RowHeight::getHeight(ClcData *dat, int item) int RowHeight::getFloatingRowHeight(const ClcData *dat, HWND hwnd, ClcContact *contact, DWORD dwFlags)
{
- int height = 0;
-
- height = dat->fontInfo[GetBasicFontID(contact)].fontHeight;
-
- if ( !dat->bisEmbedded) {
- if ( !(dwFlags & FLT_SIMPLE)) {
- if (dwFlags & FLT_DUALROW) {
- height += (dat->fontInfo[FONTID_STATUS].fontHeight + cfg::dat.avatarPadding);
- }
- // Avatar size
- if (dwFlags & FLT_AVATARS && contact->cFlags & ECF_AVATAR && contact->type == CLCIT_CONTACT && contact->ace != NULL && !(contact->ace->dwFlags & AVS_HIDEONCLIST))
- height = max(height, cfg::dat.avatarSize + cfg::dat.avatarPadding);
- }
- }
-
- height = max(height, dat->min_row_heigh);
- height += cfg::dat.bRowSpacing;
-
- return height;
+ int height = max(dat->fontInfo[GetBasicFontID(contact)].fontHeight, dat->min_row_heigh);
+ return height + cfg::dat.bRowSpacing;
}
|