From 0cd049b5b56b34b0b7ab3e3eac93dcb255c4e118 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 29 Dec 2012 00:16:54 +0300
Subject: Show flags icons in language selection list

Also add support for extended listboxes in popuplist control.
---
 src/gui/widgets/extendedlistbox.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/gui/widgets/extendedlistbox.cpp')

diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index b932f91b0..8c850775a 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -37,12 +37,21 @@
 #include "debug.h"
 
 ExtendedListBox::ExtendedListBox(const Widget2 *const widget,
-                                 gcn::ListModel *const listModel) :
+                                 gcn::ListModel *const listModel,
+                                 int rowHeight) :
     ListBox(widget, listModel),
-    mRowHeight(13),
+    mRowHeight(rowHeight),
     mImagePadding(mSkin ? mSkin->getOption("imagePadding") : 0),
     mSpacing(mSkin ? mSkin->getOption("spacing") : 0)
 {
+    if (!mRowHeight)
+    {
+        const gcn::Font *font = getFont();
+        if (font)
+            mRowHeight = font->getHeight() + 2 * mPadding;
+        else
+            mRowHeight = 13;
+    }
 }
 
 ExtendedListBox::~ExtendedListBox()
-- 
cgit v1.2.3-60-g2f50