diff options
| author | Socapex <philippe_groarke@yahoo.ca> | 2013-01-19 21:02:01 -0500 |
|---|---|---|
| committer | Socapex <philippe_groarke@yahoo.ca> | 2013-01-19 21:02:01 -0500 |
| commit | df606ace309acaf0c78f52e1f98eabed6c844ae2 (patch) | |
| tree | d9799b0e4a507d9eacbbafc1755eecea03f0b373 /src/gui/widgets/extendedlistbox.cpp | |
| parent | d0169223b889a115b486e974e5b287c3ccb00d85 (diff) | |
| parent | 678d4e70999ade5a36862039875aa5564291d09d (diff) | |
| download | plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.gz plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.bz2 plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.xz plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.zip | |
Merge remote-tracking branch 'upstream/master' into osx
Diffstat (limited to 'src/gui/widgets/extendedlistbox.cpp')
| -rw-r--r-- | src/gui/widgets/extendedlistbox.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp index 8c850775a..34f4f1a45 100644 --- a/src/gui/widgets/extendedlistbox.cpp +++ b/src/gui/widgets/extendedlistbox.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2012 The ManaPlus Developers + * Copyright (C) 2012-2013 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -42,13 +42,14 @@ ExtendedListBox::ExtendedListBox(const Widget2 *const widget, ListBox(widget, listModel), mRowHeight(rowHeight), mImagePadding(mSkin ? mSkin->getOption("imagePadding") : 0), - mSpacing(mSkin ? mSkin->getOption("spacing") : 0) + mSpacing(mSkin ? mSkin->getOption("spacing") : 0), + mItemPadding(mSkin ? mSkin->getOption("itemPadding") : 1) { if (!mRowHeight) { const gcn::Font *font = getFont(); if (font) - mRowHeight = font->getHeight() + 2 * mPadding; + mRowHeight = font->getHeight() + 2 * mItemPadding; else mRowHeight = 13; } |