From 29aa6ecd3f30b071551c1a5f01cb832d80aa749c Mon Sep 17 00:00:00 2001 From: bitplane Date: Sat, 28 Feb 2009 14:27:46 +0000 Subject: [PATCH] Bug fix for the combo box where it showed white text instead of skin colour before being focused, fix posted by drewbacca git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2244 dfc29bdd-3216-0410-991c-e03cc46cb475 --- changes.txt | 2 ++ source/Irrlicht/CGUIComboBox.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/changes.txt b/changes.txt index f9e9b63c..2636eb4d 100644 --- a/changes.txt +++ b/changes.txt @@ -1,5 +1,7 @@ Changes in 1.6 + - Bug fix for the combo box where it showed white text instead of skin colour before being focused, fix posted by drewbacca + - EGDS_MESSAGE_BOX_HEIGHT is now honoured, bug reported by Spkka - Fixed a bug in the edit box where events are sometimes sent to a null parent, reported by Sudi. diff --git a/source/Irrlicht/CGUIComboBox.cpp b/source/Irrlicht/CGUIComboBox.cpp index 5ea382e5..6924011d 100644 --- a/source/Irrlicht/CGUIComboBox.cpp +++ b/source/Irrlicht/CGUIComboBox.cpp @@ -63,6 +63,8 @@ CGUIComboBox::CGUIComboBox(IGUIEnvironment* environment, IGUIElement* parent, SelectedText->setSubElement(true); SelectedText->setAlignment(EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT); SelectedText->setTextAlignment(EGUIA_UPPERLEFT, EGUIA_CENTER); + if (skin) + SelectedText->setOverrideColor(skin->getColor(EGDC_BUTTON_TEXT)); SelectedText->enableOverrideColor(true); setNotClipped(true);