Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

[TextServer] Improve ligature cursor handling.

Browse source 
Fix mid-grapheme hit test.
Fix OpenType features property handling, add default features override option.
Enable mid-grapheme cursor by default.
This commit is contained in:
bruvzg 2021-11-18 23:36:22 +02:00
parent 5a61822d7c
commit c89c515ccf
No known key found for this signature in database
GPG key ID: 7960FCF39844EC38
27 changed files with 403 additions and 286 deletions
Download patch file Download diff file Expand all files Collapse all files

140
editor/import/dynamicfont_import_settings.cpp
View file

@ -1185,6 +1185,38 @@ void DynamicFontImportSettings::_lang_remove(Object *p_item, int p_column, int p
memdelete(lang_item);
}
void DynamicFontImportSettings::_ot_add() {
menu_ot->set_position(ot_list->get_screen_transform().xform(ot_list->get_local_mouse_position()));
menu_ot->set_size(Vector2(1, 1));
menu_ot->popup();
}
void DynamicFontImportSettings::_ot_add_item(int p_option) {
String name = TS->tag_to_name(p_option);
for (TreeItem *ot_item = ot_list_root->get_first_child(); ot_item; ot_item = ot_item->get_next()) {
if (ot_item->get_text(0) == name) {
return;
}
}
TreeItem *ot_item = ot_list->create_item(ot_list_root);
ERR_FAIL_NULL(ot_item);
ot_item->set_text(0, name);
ot_item->set_editable(0, false);
ot_item->set_text(1, "1");
ot_item->set_editable(1, true);
ot_item->add_button(2, ot_list->get_theme_icon("Remove", "EditorIcons"), BUTTON_REMOVE_VAR, false, TTR("Remove"));
ot_item->set_button_color(2, 0, Color(1, 1, 1, 0.75));
}
void DynamicFontImportSettings::_ot_remove(Object *p_item, int p_column, int p_id) {
TreeItem *ot_item = (TreeItem *)p_item;
ERR_FAIL_NULL(ot_item);
ot_list_root->remove_child(ot_item);
memdelete(ot_item);
}
void DynamicFontImportSettings::_script_add() {
menu_scripts->set_position(script_list->get_screen_position() + script_list->get_local_mouse_position());
menu_scripts->reset_size();
@ -1230,6 +1262,7 @@ void DynamicFontImportSettings::_notification(int p_what) {
add_lang->set_icon(add_var->get_theme_icon("Add", "EditorIcons"));
add_script->set_icon(add_var->get_theme_icon("Add", "EditorIcons"));
add_var->set_icon(add_var->get_theme_icon("Add", "EditorIcons"));
add_ot->set_icon(add_var->get_theme_icon("Add", "EditorIcons"));
}
}
@ -1317,6 +1350,14 @@ void DynamicFontImportSettings::_re_import() {
main_settings["preload/glyph_ranges"] = ranges;
}
Dictionary ot_ov;
for (TreeItem *ot_item = ot_list_root->get_first_child(); ot_item; ot_item = ot_item->get_next()) {
String tag = ot_item->get_text(0);
int32_t value = ot_item->get_text(1).to_int();
ot_ov[tag] = value;
}
main_settings["opentype_feature_overrides"] = ot_ov;
if (OS::get_singleton()->is_stdout_verbose()) {
print_line("Import settings:");
for (Map<StringName, Variant>::Element *E = main_settings.front(); E; E = E->next()) {
@ -1373,6 +1414,7 @@ void DynamicFontImportSettings::open_settings(const String &p_path) {
vars_list->clear();
lang_list->clear();
script_list->clear();
ot_list->clear();
selected_chars.clear();
selected_glyphs.clear();
@ -1381,6 +1423,7 @@ void DynamicFontImportSettings::open_settings(const String &p_path) {
vars_list_root = vars_list->create_item();
lang_list_root = lang_list->create_item();
script_list_root = script_list->create_item();
ot_list_root = ot_list->create_item();
options_variations.clear();
Dictionary var_list = dfont_main->get_supported_variation_list();
@ -1546,6 +1589,23 @@ void DynamicFontImportSettings::open_settings(const String &p_path) {
script_item->set_editable(1, true);
script_item->add_button(2, lang_list->get_theme_icon("Remove", "EditorIcons"), BUTTON_REMOVE_VAR, false, TTR("Remove"));
}
} else if (key == "opentype_feature_overrides") {
Dictionary features = config->get_value("params", key);
for (const Variant *ftr = features.next(nullptr); ftr != nullptr; ftr = features.next(ftr)) {
TreeItem *ot_item = ot_list->create_item(ot_list_root);
ERR_FAIL_NULL(ot_item);
int32_t value = features[*ftr];
if (ftr->get_type() == Variant::STRING) {
ot_item->set_text(0, *ftr);
} else {
ot_item->set_text(0, TS->tag_to_name(*ftr));
}
ot_item->set_editable(0, false);
ot_item->set_text(1, itos(value));
ot_item->set_editable(1, true);
ot_item->add_button(2, ot_list->get_theme_icon("Remove", "EditorIcons"), BUTTON_REMOVE_VAR, false, TTR("Remove"));
ot_item->set_button_color(2, 0, Color(1, 1, 1, 0.75));
}
} else {
Variant value = config->get_value("params", key);
import_settings_data->defaults[key] = value;
@ -1570,6 +1630,39 @@ void DynamicFontImportSettings::open_settings(const String &p_path) {
font_preview_label->add_theme_font_override("font", font_preview);
font_preview_label->update();
menu_ot->clear();
menu_ot_ss->clear();
menu_ot_cv->clear();
menu_ot_cu->clear();
bool have_ss = false;
bool have_cv = false;
bool have_cu = false;
Dictionary features = font_preview->get_feature_list();
for (const Variant *ftr = features.next(nullptr); ftr != nullptr; ftr = features.next(ftr)) {
String ftr_name = TS->tag_to_name(*ftr);
if (ftr_name.begins_with("stylistic_set_")) {
menu_ot_ss->add_item(ftr_name.capitalize(), (int32_t)*ftr);
have_ss = true;
} else if (ftr_name.begins_with("character_variant_")) {
menu_ot_cv->add_item(ftr_name.capitalize(), (int32_t)*ftr);
have_cv = true;
} else if (ftr_name.begins_with("custom_")) {
menu_ot_cu->add_item(ftr_name.replace("custom_", ""), (int32_t)*ftr);
have_cu = true;
} else {
menu_ot->add_item(ftr_name.capitalize(), (int32_t)*ftr);
}
}
if (have_ss) {
menu_ot->add_submenu_item(RTR("Stylistic Sets"), "SSMenu");
}
if (have_cv) {
menu_ot->add_submenu_item(RTR("Character Variants"), "CVMenu");
}
if (have_cu) {
menu_ot->add_submenu_item(RTR("Custom"), "CUMenu");
}
_variations_validate();
popup_centered_ratio();
@ -1619,6 +1712,25 @@ DynamicFontImportSettings::DynamicFontImportSettings() {
add_child(menu_scripts);
menu_scripts->connect("id_pressed", callable_mp(this, &DynamicFontImportSettings::_script_add_item));
menu_ot = memnew(PopupMenu);
add_child(menu_ot);
menu_ot->connect("id_pressed", callable_mp(this, &DynamicFontImportSettings::_ot_add_item));
menu_ot_cv = memnew(PopupMenu);
menu_ot_cv->set_name("CVMenu");
menu_ot->add_child(menu_ot_cv);
menu_ot_cv->connect("id_pressed", callable_mp(this, &DynamicFontImportSettings::_ot_add_item));
menu_ot_ss = memnew(PopupMenu);
menu_ot_ss->set_name("SSMenu");
menu_ot->add_child(menu_ot_ss);
menu_ot_ss->connect("id_pressed", callable_mp(this, &DynamicFontImportSettings::_ot_add_item));
menu_ot_cu = memnew(PopupMenu);
menu_ot_cu->set_name("CUMenu");
menu_ot->add_child(menu_ot_cu);
menu_ot_cu->connect("id_pressed", callable_mp(this, &DynamicFontImportSettings::_ot_add_item));
Color warn_color = (EditorNode::get_singleton()) ? EditorNode::get_singleton()->get_gui_base()->get_theme_color("warning_color", "Editor") : Color(1, 1, 0);
// Root layout
@ -1897,6 +2009,34 @@ DynamicFontImportSettings::DynamicFontImportSettings() {
script_list->connect("button_pressed", callable_mp(this, &DynamicFontImportSettings::_script_remove));
script_list->set_v_size_flags(Control::SIZE_EXPAND_FILL);
HBoxContainer *hb_ot = memnew(HBoxContainer);
page5_vb->add_child(hb_ot);
label_ot = memnew(Label);
label_ot->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
label_ot->set_h_size_flags(Control::SIZE_EXPAND_FILL);
label_ot->set_text(TTR("OpenType feature overrides"));
hb_ot->add_child(label_ot);
add_ot = memnew(Button);
hb_ot->add_child(add_ot);
add_ot->set_tooltip(TTR("Add feature override"));
add_ot->set_icon(add_var->get_theme_icon("Add", "EditorIcons"));
add_ot->connect("pressed", callable_mp(this, &DynamicFontImportSettings::_ot_add));
ot_list = memnew(Tree);
page5_vb->add_child(ot_list);
ot_list->set_hide_root(true);
ot_list->set_columns(3);
ot_list->set_column_expand(0, true);
ot_list->set_column_custom_minimum_width(0, 80 * EDSCALE);
ot_list->set_column_expand(1, true);
ot_list->set_column_custom_minimum_width(1, 80 * EDSCALE);
ot_list->set_column_expand(2, false);
ot_list->set_column_custom_minimum_width(2, 50 * EDSCALE);
ot_list->connect("button_pressed", callable_mp(this, &DynamicFontImportSettings::_ot_remove));
ot_list->set_v_size_flags(Control::SIZE_EXPAND_FILL);
// Common
import_settings_data.instantiate();

15
editor/import/dynamicfont_import_settings.h
View file

@ -120,18 +120,27 @@ class DynamicFontImportSettings : public ConfirmationDialog {
Label *page5_description = nullptr;
Button *add_lang = nullptr;
Button *add_script = nullptr;
Button *add_ot = nullptr;
PopupMenu *menu_langs = nullptr;
PopupMenu *menu_scripts = nullptr;
PopupMenu *menu_ot = nullptr;
PopupMenu *menu_ot_ss = nullptr;
PopupMenu *menu_ot_cv = nullptr;
PopupMenu *menu_ot_cu = nullptr;
Tree *lang_list = nullptr;
TreeItem *lang_list_root = nullptr;
Label *label_langs = nullptr;
Tree *script_list = nullptr;
TreeItem *script_list_root = nullptr;
Label *label_langs = nullptr;
Label *label_script = nullptr;
Tree *ot_list = nullptr;
TreeItem *ot_list_root = nullptr;
Label *label_ot = nullptr;
void _lang_add();
void _lang_add_item(int p_option);
void _lang_remove(Object *p_item, int p_column, int p_id);
@ -140,6 +149,10 @@ class DynamicFontImportSettings : public ConfirmationDialog {
void _script_add_item(int p_option);
void _script_remove(Object *p_item, int p_column, int p_id);
void _ot_add();
void _ot_add_item(int p_option);
void _ot_remove(Object *p_item, int p_column, int p_id);
// Common
void _add_glyph_range_item(int32_t p_start, int32_t p_end, const String &p_name);

3
editor/import/resource_importer_dynamicfont.cpp
View file

@ -107,6 +107,7 @@ void ResourceImporterDynamicFont::get_import_options(const String &p_path, List<
r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "oversampling", PROPERTY_HINT_RANGE, "0,10,0.1"), 0.0));
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "compress"), true));
r_options->push_back(ImportOption(PropertyInfo(Variant::DICTIONARY, "opentype_feature_overrides"), Dictionary()));
r_options->push_back(ImportOption(PropertyInfo(Variant::PACKED_STRING_ARRAY, "preload/char_ranges"), Vector<String>()));
r_options->push_back(ImportOption(PropertyInfo(Variant::PACKED_STRING_ARRAY, "preload/glyph_ranges"), Vector<String>()));
@ -174,6 +175,7 @@ Error ResourceImporterDynamicFont::import(const String &p_source_file, const Str
bool msdf = p_options["multichannel_signed_distance_field"];
int px_range = p_options["msdf_pixel_range"];
int px_size = p_options["msdf_size"];
Dictionary ot_ov = p_options["opentype_feature_overrides"];
bool autohinter = p_options["force_autohinter"];
int hinting = p_options["hinting"];
@ -190,6 +192,7 @@ Error ResourceImporterDynamicFont::import(const String &p_source_file, const Str
font->set_multichannel_signed_distance_field(msdf);
font->set_msdf_pixel_range(px_range);
font->set_msdf_size(px_size);
font->set_opentype_feature_overrides(ot_ov);
font->set_fixed_size(0);
font->set_force_autohinter(autohinter);
font->set_hinting((TextServer::Hinting)hinting);