This commit is contained in:
Eduardo Bart 2011-08-15 06:55:43 -03:00
parent 92b54b6f55
commit a5b41f77ea
4 changed files with 7 additions and 2 deletions

View File

@ -120,6 +120,7 @@ SET(SOURCES
src/framework/ui/uiwindow.cpp src/framework/ui/uiwindow.cpp
src/framework/ui/uianchorlayout.cpp src/framework/ui/uianchorlayout.cpp
src/framework/ui/uianchor.cpp src/framework/ui/uianchor.cpp
src/framework/ui/uilist.cpp
) )
IF(WIN32) IF(WIN32)

View File

@ -10,3 +10,6 @@ RoundedPanel < Panel
border-image: border-image:
source: /core_ui/images/panel_rounded.png source: /core_ui/images/panel_rounded.png
border: 4 border: 4
RectPanel < UIWidget
image: /core_ui/images/emptyrect.png

View File

@ -30,7 +30,8 @@ enum UIWidgetType {
UITypeLabel, UITypeLabel,
UITypeButton, UITypeButton,
UITypeLineEdit, UITypeLineEdit,
UITypeWindow UITypeWindow,
UITypeList
}; };
enum FocusReason { enum FocusReason {

View File

@ -30,7 +30,7 @@ void UILabel::loadStyleFromOTML(const OTMLNodePtr& styleNode)
void UILabel::render() void UILabel::render()
{ {
getFont()->renderText(m_text, getGeometry(), m_align, m_fontColor); m_font->renderText(m_text, m_rect, m_align, m_fontColor);
} }
void UILabel::resizeToText() void UILabel::resizeToText()