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

Improve the sizing of the widgets in gui2.

Browse source 
Still needs more tweaking post 1.8, but with this fix the scrollbars in
the MP lobby appear less often. (Still show at small screens, but I
consider that "as designed".)
This commit is contained in:
Mark de Wever 2010-03-14 12:17:06 +00:00
parent ecf39097ba
commit 5f38723d1e
3 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog
View file

@ -17,6 +17,9 @@ Version 1.7.14+svn:
traits because of usage of local RNG instead of MP RNG.
* Music and sound effects:
* Added new music track, "Weight of Revenge" by Doug Kaufman
* User interface:
* Improved resizing of a window when the contents don't fit, fixes the
window scrollbars in the MP lobby
Version 1.7.14-1.8beta7:
* AI:

2
players_changelog
View file

@ -10,6 +10,8 @@ Version 1.7.14+svn:
traits because of usage of local RNG instead of MP RNG.
* Music and sound effects:
* Added new music track, "Weight of Revenge" by Doug Kaufman
* User interface:
* Avoid the scrollbar on the entire MP lobby when possible.
Version 1.7.14-1.8beta7:
* Language and i18n:

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

@ -311,22 +311,34 @@ void tgrid::request_reduce_height(const unsigned maximum_height)
const unsigned too_high = size.y - maximum_height;
unsigned reduced = 0;
for(size_t row = 0; row < rows_; ++row) {
unsigned wanted_height = row_height_[row] - (too_high - reduced);
/**
* @todo Improve this code.
*
* Now we try every item to be reduced, maybe items need a flag whether
* or not to try to reduce and also eveluate whether the force
* reduction is still needed.
*/
if(too_high - reduced >= row_height_[row]) {
DBG_GUI_L << LOG_HEADER
<< " row " << row
<< " is too small to be reduced.\n";
continue;
<< " height " << row_height_[row]
<< " want to reduce " << too_high
<< " is too small to be reduced fully try 1 pixel.\n";
wanted_height = 1;
}
const unsigned wanted_height = row_height_[row] - (too_high - reduced);
const unsigned height = tgrid_implementation::
row_request_reduce_height(*this, row, wanted_height);
if(height < row_height_[row]) {
DBG_GUI_L << LOG_HEADER
<< " row " << row
<< " height " << row_height_[row]
<< " want to reduce " << too_high
<< " reduced " << row_height_[row] - height
<< " pixels for row " << row
<< ".\n";
<< " pixels.\n";
size.y -= row_height_[row] - height;
row_height_[row] = height;
@ -337,7 +349,14 @@ void tgrid::request_reduce_height(const unsigned maximum_height)
}
}
set_layout_size(calculate_best_size());
size = calculate_best_size();
DBG_GUI_L << LOG_HEADER
<< " Requested maximum " << maximum_height
<< " resulting height " << size.y
<< ".\n";
set_layout_size(size);
}
void tgrid::demand_reduce_height(const unsigned /*maximum_height*/)