mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26691) -Codechange: Simplify ShowDropDownListAt (Juanjo)

release/1.5
frosch 2014-07-16 20:38:36 +00:00
parent e6641f86d8
commit 925fb7bd37
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/widgets/dropdown.cpp
View File

@ -344,22 +344,16 @@ void ShowDropDownListAt(Window *w, const DropDownList *list, int selected, int b
/* The preferred width equals the calling widget */ /* The preferred width equals the calling widget */
uint width = wi_rect.right - wi_rect.left + 1; uint width = wi_rect.right - wi_rect.left + 1;
/* Longest item in the list, if auto_width is enabled */
uint max_item_width = 0; uint max_item_width = 0;
if (auto_width) {
/* Find the longest item in the list */
for (const DropDownListItem * const *it = list->Begin(); it != list->End(); ++it) {
const DropDownListItem *item = *it;
max_item_width = max(max_item_width, item->Width() + 5);
}
}
/* Total length of list */ /* Total length of list */
int height = 0; int height = 0;
for (const DropDownListItem * const *it = list->Begin(); it != list->End(); ++it) { for (const DropDownListItem * const *it = list->Begin(); it != list->End(); ++it) {
const DropDownListItem *item = *it; const DropDownListItem *item = *it;
height += item->Height(width); height += item->Height(width);
if (auto_width) max_item_width = max(max_item_width, item->Width() + 5);
} }
/* Check if the status bar is visible, as we don't want to draw over it */ /* Check if the status bar is visible, as we don't want to draw over it */