From dfb302bb66f032eb0c7eb4bc0934fdf0571a1d3a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 21 Oct 2012 19:33:46 +0300 Subject: Extend textfield theming. New theme options: padding frameSize --- src/guichan/widgets/textfield.cpp | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'src/guichan/widgets') diff --git a/src/guichan/widgets/textfield.cpp b/src/guichan/widgets/textfield.cpp index 64d647631..c0575eace 100644 --- a/src/guichan/widgets/textfield.cpp +++ b/src/guichan/widgets/textfield.cpp @@ -115,46 +115,18 @@ namespace gcn void TextField::adjustSize() { - setWidth(getFont()->getWidth(mText) + 7); - adjustHeight(); - - fixScroll(); } void TextField::adjustHeight() { - setHeight(getFont()->getHeight() + 4); } void TextField::fixScroll() { - if (isFocused()) - { - const int caretX = getFont()->getWidth( - mText.substr(0, mCaretPosition)); - - if (caretX - mXScroll >= getWidth() - 4) - { - mXScroll = caretX - getWidth() + 4; - } - else if (caretX - mXScroll <= 0) - { - mXScroll = caretX - getWidth() / 2; - - if (mXScroll < 0) - mXScroll = 0; - } - } } void TextField::setCaretPosition(unsigned int position) { - if (position > mText.size()) - mCaretPosition = static_cast(mText.size()); - else - mCaretPosition = position; - - fixScroll(); } unsigned int TextField::getCaretPosition() const @@ -169,6 +141,5 @@ namespace gcn void TextField::fontChanged() { - fixScroll(); } } -- cgit v1.2.3-60-g2f50