0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix logic error in grid "request reduce size" functions

Browse source 
The functions never assigned anything to the local variable "reduced".
This commit is contained in:
Jyrki Vesterinen 2016-11-05 21:23:50 +02:00
parent 6300aa4352
commit 5984daae6e
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gui/widgets/grid.cpp
View file

@ -257,11 +257,14 @@ void tgrid::request_reduce_width(const unsigned maximum_width)
*this, col, wanted_width);
if(width < col_width_[col]) {
DBG_GUI_L << LOG_HEADER << " reduced " << col_width_[col] - width
unsigned reduction = col_width_[col] - width;
DBG_GUI_L << LOG_HEADER << " reduced " << reduction
<< " pixels for column " << col << ".\n";
size.x -= col_width_[col] - width;
size.x -= reduction;
col_width_[col] = width;
reduced += reduction;
}
if(size.x <= static_cast<int>(maximum_width)) {
@ -341,13 +344,15 @@ void tgrid::request_reduce_height(const unsigned maximum_height)
*this, row, wanted_height);
if(height < row_height_[row]) {
unsigned reduction = row_height_[row] - height;
DBG_GUI_L << LOG_HEADER << " row " << row << " height "
<< row_height_[row] << " want to reduce " << too_high
<< " reduced " << row_height_[row] - height
<< " pixels.\n";
<< " reduced " << reduction << " pixels.\n";
size.y -= row_height_[row] - height;
size.y -= reduction;
row_height_[row] = height;
reduced += reduction;
}
if(size.y <= static_cast<int>(maximum_height)) {