Merge branch 'hotfix-1.6' into develop

This commit is contained in:
Jinhao 2018-06-13 23:46:12 +08:00
commit 69e6f4c4a4

View File

@ -2470,10 +2470,10 @@ namespace nana
x += col.width_px; x += col.width_px;
if (x > 0) if (x > 0)
{ {
seqs.push_back(col.index);
if (x >= static_cast<int>(lister_w)) if (x >= static_cast<int>(lister_w))
break; break;
seqs.push_back(col.index);
} }
} }
return seqs; return seqs;