diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-10-20 17:38:06 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-10-20 17:38:06 +0000 |
| commit | 6183362250af373372830fbd5d4d952b0038bbfc (patch) | |
| tree | 986e7c937720b5d93e00dcc2e7ee3b2f47a7286d /plugins/Clist_modern/src/modern_row.cpp | |
| parent | 7e4a5794928702bf435f3d7be339a6c553fe618a (diff) | |
more warning fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@6558 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_modern/src/modern_row.cpp')
| -rw-r--r-- | plugins/Clist_modern/src/modern_row.cpp | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/plugins/Clist_modern/src/modern_row.cpp b/plugins/Clist_modern/src/modern_row.cpp index a83ef4ffae..058b48f2e8 100644 --- a/plugins/Clist_modern/src/modern_row.cpp +++ b/plugins/Clist_modern/src/modern_row.cpp @@ -668,33 +668,7 @@ void rowPositioning(pROWCELL cell, int &dist) w -= size;
if (curchild->sizing)
{
- if ((0&!curchild->fitwidth) || r>1) //пока отключено -проблемы с выравниванием
- {
- if (curchild->hasfixed)
- fixedsized -= curchild->fixed_width;
- switch (cell->halign)
- {
- case TC_RIGHT:
- size = (w-fixedsized)-(autosized-max(curchild->full_width,curchild->w));
- break;
- case TC_LEFT:
- size = min(w-fixedsized,max(curchild->full_width,curchild->w));
- break;
- case TC_HCENTER:
- if (autosized) {size = max(curchild->full_width,curchild->w)*w/autosized; break;}
- default:
- size = w / r;
- }
- autosized -= (max(curchild->full_width,curchild->w));
- if (autosized < 0) autosized = 0;
- if (size < 0) size = 0;
- }
- else size = w;
- /* пока отключено ибо параметр влияет на выравнивание включается по левому краю
- if (0 && !curchild->fitwidth)
- if (size>max(curchild->full_width,curchild->w))
- size = max(curchild->full_width,curchild->w);
- */
+ size = w;
r--;
}
else
|