diff --git a/data/skins/coal/stkskin.xml b/data/skins/coal/stkskin.xml index 2eb135af8..f31397dcd 100644 --- a/data/skins/coal/stkskin.xml +++ b/data/skins/coal/stkskin.xml @@ -338,12 +338,12 @@ to specify all types of ttf. - + - + - - + + diff --git a/src/guiengine/skin.cpp b/src/guiengine/skin.cpp index 101a3cbf5..56eaae7bd 100644 --- a/src/guiengine/skin.cpp +++ b/src/guiengine/skin.cpp @@ -2918,7 +2918,15 @@ u32 Skin::getIcon (EGUI_DEFAULT_ICON icon) const s32 Skin::getSize (EGUI_DEFAULT_SIZE texture_size) const { - return m_fallback_skin->getSize(texture_size); + switch(texture_size) + { + // TODO : make this depend on the text-size parameter and/or skin + // and perhaps rename it + case EGDS_TEXT_DISTANCE_X: + return 10; + default: + return m_fallback_skin->getSize(texture_size); + } } // ----------------------------------------------------------------------------- diff --git a/src/guiengine/widgets/CGUIEditBox.cpp b/src/guiengine/widgets/CGUIEditBox.cpp index ca9880750..7af0c6b68 100644 --- a/src/guiengine/widgets/CGUIEditBox.cpp +++ b/src/guiengine/widgets/CGUIEditBox.cpp @@ -1017,7 +1017,7 @@ void CGUIEditBox::draw() core::rect< s32 > caret_rect = CurrentTextRect; caret_rect.UpperLeftCorner.X += m_cursor_distance - 1; caret_rect.LowerRightCorner.X = caret_rect.UpperLeftCorner.X + 2; - GL32_draw2DRectangle(video::SColor(255, 0, 0, 0), caret_rect); + GL32_draw2DRectangle(skin->getColor(EGDC_BUTTON_TEXT), caret_rect); } // Return the override color information to its previous settings.