BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Add font styling options to tables and textlists (#10203)

Browse Source
This commit is contained in:
v-rob 2020-08-11 11:07:17 -07:00 committed by GitHub
parent abfea69e5f
commit cd0e213a36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/guiFormSpecMenu.cpp
View File

@ -1225,6 +1225,7 @@ void GUIFormSpecMenu::parseTable(parserData* data, const std::string &element)
auto style = getDefaultStyleForElement("table", name); auto style = getDefaultStyleForElement("table", name);
e->setNotClipped(style.getBool(StyleSpec::NOCLIP, false)); e->setNotClipped(style.getBool(StyleSpec::NOCLIP, false));
e->setOverrideFont(style.getFont());
m_tables.emplace_back(spec, e); m_tables.emplace_back(spec, e);
m_fields.push_back(spec); m_fields.push_back(spec);
@ -1302,6 +1303,7 @@ void GUIFormSpecMenu::parseTextList(parserData* data, const std::string &element
auto style = getDefaultStyleForElement("textlist", name); auto style = getDefaultStyleForElement("textlist", name);
e->setNotClipped(style.getBool(StyleSpec::NOCLIP, false)); e->setNotClipped(style.getBool(StyleSpec::NOCLIP, false));
e->setOverrideFont(style.getFont());
m_tables.emplace_back(spec, e); m_tables.emplace_back(spec, e);
m_fields.push_back(spec); m_fields.push_back(spec);

27
src/gui/guiTable.cpp
View File

@ -56,7 +56,7 @@ GUITable::GUITable(gui::IGUIEnvironment *env,
m_font = skin->getFont(); m_font = skin->getFont();
if (m_font) { if (m_font) {
m_font->grab(); m_font->grab();
m_rowheight = m_font->getDimension(L"A").Height + 4; m_rowheight = m_font->getDimension(L"Ay").Height + 4;
m_rowheight = MYMAX(m_rowheight, 1); m_rowheight = MYMAX(m_rowheight, 1);
} }
@ -586,6 +586,31 @@ void GUITable::setSelected(s32 index)
} }
} }
void GUITable::setOverrideFont(IGUIFont *font)
{
if (m_font == font)
return;
if (font == nullptr)
font = Environment->getSkin()->getFont();
if (m_font)
m_font->drop();
m_font = font;
m_font->grab();
m_rowheight = m_font->getDimension(L"Ay").Height + 4;
m_rowheight = MYMAX(m_rowheight, 1);
updateScrollBar();
}
IGUIFont *GUITable::getOverrideFont() const
{
return m_font;
}
GUITable::DynamicData GUITable::getDynamicData() const GUITable::DynamicData GUITable::getDynamicData() const
{ {
DynamicData dyndata; DynamicData dyndata;

6
src/gui/guiTable.h
View File

@ -123,6 +123,12 @@ public:
// Autoscroll to make the selected row fully visible // Autoscroll to make the selected row fully visible
void setSelected(s32 index); void setSelected(s32 index);
//! Sets another skin independent font. If this is set to zero, the button uses the font of the skin.
virtual void setOverrideFont(gui::IGUIFont *font = nullptr);
//! Gets the override font (if any)
virtual gui::IGUIFont *getOverrideFont() const;
/* Get selection, scroll position and opened (sub)trees */ /* Get selection, scroll position and opened (sub)trees */
DynamicData getDynamicData() const; DynamicData getDynamicData() const;