diff options
| -rw-r--r-- | src/gui/truetypefont.cpp | 8 | ||||
| -rw-r--r-- | src/gui/widgets/dropdown.cpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp index 62a27651..e07adc9f 100644 --- a/src/gui/truetypefont.cpp +++ b/src/gui/truetypefont.cpp @@ -19,12 +19,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <guichan/exception.hpp> +#include "gui/truetypefont.h" -#include "truetypefont.h" +#include "graphics.h" +#include "resources/image.h" -#include "../graphics.h" -#include "../resources/image.h" +#include <guichan/exception.hpp> #define CACHE_SIZE 256 diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index 491e6396..e838aab6 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -140,15 +140,15 @@ void DropDown::draw(gcn::Graphics* graphics) const int alpha = (int) (mAlpha * 255.0f); gcn::Color faceColor = getBaseColor(); faceColor.a = alpha; - const gcn::Color* highlightColor = &guiPalette->getColor(Palette::HIGHLIGHT, - alpha); + const gcn::Color *highlightColor = + &guiPalette->getColor(Palette::HIGHLIGHT, alpha); gcn::Color shadowColor = faceColor - 0x303030; shadowColor.a = alpha; if (mListBox->getListModel() && mListBox->getSelected() >= 0) { graphics->setFont(getFont()); - graphics->setColor(guiPalette->getColor(Palette::TEXT, alpha)); + graphics->setColor(guiPalette->getColor(Palette::TEXT)); graphics->drawText(mListBox->getListModel()->getElementAt(mListBox->getSelected()), 1, 0); } |