godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some metrics (some issues caused by the new Noto Sans font).

Browse Source 
plus other minor fixes
This commit is contained in:
Daniel J. Ramirez 2017-09-03 01:49:31 -05:00
parent ce28452109
commit e298f931a6
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editor/editor_fonts.cpp
View File

@ -72,11 +72,14 @@ static Ref<BitmapFont> make_font(int p_height, int p_ascent, int p_valign, int p
m_name->add_fallback(FontJapanese); \ m_name->add_fallback(FontJapanese); \
m_name->add_fallback(FontFallback); m_name->add_fallback(FontFallback);
#define MAKE_DEFAULT_FONT(m_name, m_size) \ // the custom spacings might only work with Noto Sans
Ref<DynamicFont> m_name; \ #define MAKE_DEFAULT_FONT(m_name, m_size) \
m_name.instance(); \ Ref<DynamicFont> m_name; \
m_name->set_size(m_size); \ m_name.instance(); \
m_name->set_font_data(DefaultFont); \ 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); MAKE_FALLBACKS(m_name);
void editor_register_fonts(Ref<Theme> p_theme) { void editor_register_fonts(Ref<Theme> p_theme) {

4
editor/editor_themes.cpp
View File

@ -333,10 +333,10 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
theme->set_stylebox("MenuHover", "EditorStyles", style_menu_hover_border); theme->set_stylebox("MenuHover", "EditorStyles", style_menu_hover_border);
// Content of each tab // Content of each tab
Ref<StyleBoxFlat> style_content_panel = make_flat_stylebox(base_color, 4, 5, 4, 4); Ref<StyleBoxFlat> style_content_panel = make_flat_stylebox(base_color, 4, 4, 4, 4);
style_content_panel->set_border_color_all(base_color); style_content_panel->set_border_color_all(base_color);
style_content_panel->set_border_width_all(border_width); style_content_panel->set_border_width_all(border_width);
Ref<StyleBoxFlat> style_content_panel_vp = make_flat_stylebox(base_color, border_width, 5, border_width, border_width); Ref<StyleBoxFlat> style_content_panel_vp = make_flat_stylebox(base_color, border_width, 4, border_width, border_width);
style_content_panel_vp->set_border_color_all(base_color); style_content_panel_vp->set_border_color_all(base_color);
style_content_panel_vp->set_border_width_all(border_width); style_content_panel_vp->set_border_width_all(border_width);
theme->set_stylebox("panel", "TabContainer", style_content_panel); theme->set_stylebox("panel", "TabContainer", style_content_panel);

2
editor/filesystem_dock.cpp
View File

@ -1839,7 +1839,7 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) {
path = "res://"; path = "res://";
add_constant_override("separation", 3); add_constant_override("separation", 4);
} }
FileSystemDock::~FileSystemDock() { FileSystemDock::~FileSystemDock() {

2
scene/gui/line_edit.cpp
View File

@ -631,7 +631,7 @@ void LineEdit::_notification(int p_what) {
if (has_icon("right_icon")) { if (has_icon("right_icon")) {
Ref<Texture> r_icon = Control::get_icon("right_icon"); Ref<Texture> r_icon = Control::get_icon("right_icon");
ofs_max -= r_icon->get_width(); ofs_max -= r_icon->get_width();
r_icon->draw(ci, Point2(width - r_icon->get_width() - x_ofs, y_ofs), Color(1, 1, 1, disabled_alpha * .9)); r_icon->draw(ci, Point2(width - r_icon->get_width() - x_ofs, height / 2 - r_icon->get_height() / 2), Color(1, 1, 1, disabled_alpha * .9));
} }
int caret_height = font->get_height() > y_area ? y_area : font->get_height(); int caret_height = font->get_height() > y_area ? y_area : font->get_height();