Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Table colspan overwrites previous row column width

Browse source
This commit is contained in:
Nimetu 2015-12-18 14:29:40 +02:00
parent 4e329f0e55
commit e510db5c31
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
code/nel/src/gui/group_table.cpp
View file

@ -805,12 +805,13 @@ namespace NLGUI
uint newsize = column + cell->ColSpan - 1; uint newsize = column + cell->ColSpan - 1;
if (newsize >= _Columns.size()) if (newsize >= _Columns.size())
_Columns.resize(newsize+1); _Columns.resize(newsize+1);
for(uint span = 0; span < cell->ColSpan -1; span++){ for(uint span = 0; span < cell->ColSpan -1; span++){
column++; column++;
_Columns[column].Width = _Columns[column-1].Width; _Columns[column].Width = std::max(_Columns[column].Width, _Columns[column-1].Width);
_Columns[column].WidthMax = _Columns[column-1].WidthMax; _Columns[column].WidthMax = std::max(_Columns[column].WidthMax, _Columns[column-1].WidthMax);
_Columns[column].TableRatio = _Columns[column-1].TableRatio; _Columns[column].TableRatio = std::max(_Columns[column].TableRatio, _Columns[column-1].TableRatio);
_Columns[column].WidthWanted = _Columns[column-1].WidthWanted; _Columns[column].WidthWanted = std::max(_Columns[column].WidthWanted, _Columns[column-1].WidthWanted);
_Columns[column].RowSpan = _Columns[column-1].RowSpan; _Columns[column].RowSpan = _Columns[column-1].RowSpan;
} }
} }