PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

default multiline labels valign set to 'top' + content panel width increased

Browse Source
This commit is contained in:
MihailRis 2024-05-05 23:37:40 +03:00
parent 4dc2c4701d
commit 8b1c102cfe
5 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
res/layouts/pages/content.xml
View File

@ -1,12 +1,12 @@
<container size='767,454' color='#0F1E2DB2' padding='8' interval='5' context='menu'> <container size='887,454' color='#0F1E2DB2' padding='8' interval='5' context='menu'>
<panel id='packs_cur' pos='2' size='380,406' color='0' max-length='406'> <panel id='packs_cur' pos='2' size='440,406' color='0' max-length='406'>
<!-- content is generated in script --> <!-- content is generated in script -->
</panel> </panel>
<panel id='packs_add' pos='385,2' size='380,406' color='0' max-length='406'> <panel id='packs_add' pos='445,2' size='440,406' color='0' max-length='406'>
<!-- content is generated in script --> <!-- content is generated in script -->
</panel> </panel>
<button id='apply_btn' pos='2,410' size='380,40' onclick='apply()'>@Apply</button> <button id='apply_btn' pos='2,410' size='440,40' onclick='apply()'>@Apply</button>
<button pos='385,410' size='338,40' onclick='menu:back()'>@Cancel</button> <button pos='445,410' size='398,40' onclick='menu:back()'>@Cancel</button>
<image onclick='refresh()' interactive='true' src='gui/refresh' <image onclick='refresh()' interactive='true' src='gui/refresh'
size='32' margin='7' gravity='bottom-right' size='32' margin='7' gravity='bottom-right'
color='#FFFFFF80' hover-color='#FFFFFF10'/> color='#FFFFFF80' hover-color='#FFFFFF10'/>

6
res/layouts/templates/pack.xml
View File

@ -1,4 +1,4 @@
<container id='pack_%{id}' onclick='%{callback}' size='540,80' color='#00000040' hover-color='#00000080' z-index="%{index}"> <container id='pack_%{id}' onclick='%{callback}' size='0,80' color='#00000040' hover-color='#00000080' z-index="%{index}">
<label color='#FFFFFF80' size='300,25' align='right' gravity='top-right'> <label color='#FFFFFF80' size='300,25' align='right' gravity='top-right'>
[%{id_verbose}] [%{id_verbose}]
</label> </label>
@ -7,8 +7,8 @@
gravity='bottom-right'> gravity='bottom-right'>
%{creator} %{creator}
</label> </label>
<label if='%{error}' pos='80,28' size='290,50' multiline='true' color='#FF4040'>%{error}</label> <label if='%{error}' pos='80,28' size='355,50' multiline='true' color='#FF4040'>%{error}</label>
<label pos='80,28' color='#FFFFFFB2'> <label pos='80,28' size='355,50' multiline='true' color='#FFFFFFB2'>
%{description} %{description}
</label> </label>
<image pos='8,8' src='%{icon}' size='64'/> <image pos='8,8' src='%{icon}' size='64'/>

22
src/graphics/ui/elements/Label.cpp
View File

@ -162,24 +162,14 @@ void Label::draw(const DrawContext* pctx, Assets* assets) {
glm::vec2 pos = calcPos(); glm::vec2 pos = calcPos();
switch (align) { switch (align) {
case Align::left: case Align::left: break;
break; case Align::center: pos.x += (size.x-newsize.x)*0.5f; break;
case Align::center: case Align::right: pos.x += size.x-newsize.x; break;
pos.x += (size.x-newsize.x)*0.5f;
break;
case Align::right:
pos.x += size.x-newsize.x;
break;
} }
switch (valign) { switch (valign) {
case Align::top: case Align::top: break;
break; case Align::center: pos.y += (size.y-newsize.y)*0.5f; break;
case Align::center: case Align::bottom: pos.y += size.y-newsize.y; break;
pos.y += (size.y-newsize.y)*0.5f;
break;
case Align::bottom:
pos.y += size.y-newsize.y;
break;
} }
textYOffset = pos.y-calcPos().y; textYOffset = pos.y-calcPos().y;
totalLineHeight = lineHeight; totalLineHeight = lineHeight;

3
src/graphics/ui/gui_xml.cpp
View File

@ -222,6 +222,9 @@ static std::shared_ptr<UINode> readLabel(UiXmlReader& reader, xml::xmlelement el
} }
if (element->has("multiline")) { if (element->has("multiline")) {
label->setMultiline(element->attr("multiline").asBool()); label->setMultiline(element->attr("multiline").asBool());
if (!element->has("valign")) {
label->setVerticalAlign(Align::top);
}
} }
if (element->has("text-wrap")) { if (element->has("text-wrap")) {
label->setTextWrapping(element->attr("text-wrap").asBool()); label->setTextWrapping(element->attr("text-wrap").asBool());

1
src/logic/scripting/lua/LuaState.cpp
View File

@ -437,7 +437,6 @@ void lua::LuaState::removeEnvironment(int id) {
} }
lua_pushnil(L); lua_pushnil(L);
setglobal(envName(id)); setglobal(envName(id));
logger.debug() << "removed environment " << envName(id);
} }
bool lua::LuaState::emit_event(const std::string &name, std::function<int(lua::LuaState *)> args) { bool lua::LuaState::emit_event(const std::string &name, std::function<int(lua::LuaState *)> args) {