default multiline labels valign set to 'top' + content panel width increased
This commit is contained in:
@@ -162,24 +162,14 @@ void Label::draw(const DrawContext* pctx, Assets* assets) {
|
||||
|
||||
glm::vec2 pos = calcPos();
|
||||
switch (align) {
|
||||
case Align::left:
|
||||
break;
|
||||
case Align::center:
|
||||
pos.x += (size.x-newsize.x)*0.5f;
|
||||
break;
|
||||
case Align::right:
|
||||
pos.x += size.x-newsize.x;
|
||||
break;
|
||||
case Align::left: break;
|
||||
case Align::center: pos.x += (size.x-newsize.x)*0.5f; break;
|
||||
case Align::right: pos.x += size.x-newsize.x; break;
|
||||
}
|
||||
switch (valign) {
|
||||
case Align::top:
|
||||
break;
|
||||
case Align::center:
|
||||
pos.y += (size.y-newsize.y)*0.5f;
|
||||
break;
|
||||
case Align::bottom:
|
||||
pos.y += size.y-newsize.y;
|
||||
break;
|
||||
case Align::top: break;
|
||||
case Align::center: pos.y += (size.y-newsize.y)*0.5f; break;
|
||||
case Align::bottom: pos.y += size.y-newsize.y; break;
|
||||
}
|
||||
textYOffset = pos.y-calcPos().y;
|
||||
totalLineHeight = lineHeight;
|
||||
|
||||
@@ -222,6 +222,9 @@ static std::shared_ptr<UINode> readLabel(UiXmlReader& reader, xml::xmlelement el
|
||||
}
|
||||
if (element->has("multiline")) {
|
||||
label->setMultiline(element->attr("multiline").asBool());
|
||||
if (!element->has("valign")) {
|
||||
label->setVerticalAlign(Align::top);
|
||||
}
|
||||
}
|
||||
if (element->has("text-wrap")) {
|
||||
label->setTextWrapping(element->attr("text-wrap").asBool());
|
||||
|
||||
@@ -437,7 +437,6 @@ void lua::LuaState::removeEnvironment(int id) {
|
||||
}
|
||||
lua_pushnil(L);
|
||||
setglobal(envName(id));
|
||||
logger.debug() << "removed environment " << envName(id);
|
||||
}
|
||||
|
||||
bool lua::LuaState::emit_event(const std::string &name, std::function<int(lua::LuaState *)> args) {
|
||||
|
||||
Reference in New Issue
Block a user