ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert widget changes

Browse Source
This commit is contained in:
Benau 2015-10-12 07:33:09 +08:00
parent 23e1f8fb3e
commit c7f20e549d
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/guiengine/layout_manager.cpp
View File

@ -537,9 +537,7 @@ void LayoutManager::doCalculateLayout(PtrVector<Widget>& widgets, AbstractTopLev
align.c_str(), widgets[n].m_properties[PROP_ID].c_str());
}
//Used to get text in label widget wrapped better
int padding = (int)(irr_driver->getFrameSize().Width*0.05f);
widgets[n].m_w = (int)(left_space*fraction) - padding;
widgets[n].m_w = (int)(left_space*fraction);
if (widgets[n].m_properties[PROP_MAX_WIDTH].size() > 0)
{
const int max_width = atoi_p( widgets[n].m_properties[PROP_MAX_WIDTH].c_str() );
@ -554,7 +552,7 @@ void LayoutManager::doCalculateLayout(PtrVector<Widget>& widgets, AbstractTopLev
widgets[n].m_w = 1;
}
x += widgets[n].m_w + padding;
x += widgets[n].m_w;
}
else
{

6
src/guiengine/widgets/label_widget.cpp
View File

@ -60,11 +60,7 @@ LabelWidget::LabelWidget(bool title, bool bright) : Widget(WTYPE_LABEL)
void LabelWidget::add()
{
rect<s32> widget_size = rect<s32>(m_x, m_y, m_x + m_w, m_y + m_h);
bool word_wrap; //Enable text wrapping unless explicitly stated not to
if (m_properties[PROP_WORD_WRAP] == "false")
word_wrap = false;
else
word_wrap = true;
const bool word_wrap = m_properties[PROP_WORD_WRAP] == "true";
stringw message = getText();
EGUI_ALIGNMENT align = EGUIA_UPPERLEFT;