From 1ff942287f418ed3b69f246e313b8312558896c6 Mon Sep 17 00:00:00 2001 From: volzhs Date: Sun, 3 Sep 2017 01:52:49 +0900 Subject: [PATCH 1/2] Adjust Noto font metrics --- editor/editor_fonts.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp index 53b05961d6..ceee4b79db 100644 --- a/editor/editor_fonts.cpp +++ b/editor/editor_fonts.cpp @@ -71,11 +71,13 @@ static Ref make_font(int p_height, int p_ascent, int p_valign, int p m_name->add_fallback(FontJapanese); \ m_name->add_fallback(FontFallback); -#define MAKE_DEFAULT_FONT(m_name, m_size) \ - Ref m_name; \ - m_name.instance(); \ - m_name->set_size(m_size); \ - m_name->set_font_data(DefaultFont); \ +#define MAKE_DEFAULT_FONT(m_name, m_size) \ + Ref m_name; \ + m_name.instance(); \ + m_name->set_size(m_size); \ + m_name->set_font_data(DefaultFont); \ + m_name->set_spacing(DynamicFont::SPACING_TOP, -1); \ + m_name->set_spacing(DynamicFont::SPACING_BOTTOM, -1); \ MAKE_FALLBACKS(m_name); void editor_register_fonts(Ref p_theme) { From 3cd5f73a02b9f68810acaa7f3a86c7ab6082a817 Mon Sep 17 00:00:00 2001 From: volzhs Date: Sun, 3 Sep 2017 03:53:10 +0900 Subject: [PATCH 2/2] LineEdit in Tree is located vertically center This is made separated commit to cherry-pick easily on another branch --- scene/gui/tree.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index ded5c89415..830a258b72 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -1022,7 +1022,8 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2 cache.selected->draw(ci, r); } if (text_editor->is_visible()) { - text_editor->set_pos(get_global_pos() + r.pos); + Vector2 ofs(0, (text_editor->get_size().height - r.size.height) / 2); + text_editor->set_pos(get_global_pos() + r.pos - ofs); } } @@ -2385,8 +2386,8 @@ bool Tree::edit_selected() { return true; } else if (c.mode == TreeItem::CELL_MODE_STRING || c.mode == TreeItem::CELL_MODE_RANGE || c.mode == TreeItem::CELL_MODE_RANGE_EXPRESSION) { - - Point2i textedpos = get_global_pos() + rect.pos; + Vector2 ofs(0, (text_editor->get_size().height - rect.size.height) / 2); + Point2i textedpos = get_global_pos() + rect.pos - ofs; text_editor->set_pos(textedpos); text_editor->set_size(rect.size); text_editor->clear();