asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #59500 from fire-forge/opentype-button

Browse source
This commit is contained in:
Rémi Verschelde 2022-03-25 18:14:58 +01:00 committed by GitHub
commit d3064400c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
editor/plugins/ot_features_plugin.cpp
View file

@ -96,10 +96,19 @@ OpenTypeFeaturesEditor::OpenTypeFeaturesEditor() {
/*************************************************************************/ /*************************************************************************/
void OpenTypeFeaturesAdd::_add_feature(int p_option) { void OpenTypeFeaturesAdd::_add_feature(int p_option) {
get_edited_object()->set("opentype_features/" + TS->tag_to_name(p_option), 1); edited_object->set("opentype_features/" + TS->tag_to_name(p_option), 1);
} }
void OpenTypeFeaturesAdd::update_property() { void OpenTypeFeaturesAdd::_features_menu() {
Size2 size = get_size();
menu->set_position(get_screen_position() + Size2(0, size.height * get_global_transform().get_scale().y));
menu->reset_size();
menu->popup();
}
void OpenTypeFeaturesAdd::setup(Object *p_object) {
edited_object = p_object;
menu->clear(); menu->clear();
menu_ss->clear(); menu_ss->clear();
menu_cv->clear(); menu_cv->clear();
@ -107,7 +116,7 @@ void OpenTypeFeaturesAdd::update_property() {
bool have_ss = false; bool have_ss = false;
bool have_cv = false; bool have_cv = false;
bool have_cu = false; bool have_cu = false;
Dictionary features = Object::cast_to<Control>(get_edited_object())->get_theme_font(SNAME("font"))->get_feature_list(); Dictionary features = Object::cast_to<Control>(edited_object)->get_theme_font(SNAME("font"))->get_feature_list();
for (const Variant *ftr = features.next(nullptr); ftr != nullptr; ftr = features.next(ftr)) { for (const Variant *ftr = features.next(nullptr); ftr != nullptr; ftr = features.next(ftr)) {
String ftr_name = TS->tag_to_name(*ftr); String ftr_name = TS->tag_to_name(*ftr);
if (ftr_name.begins_with("stylistic_set_")) { if (ftr_name.begins_with("stylistic_set_")) {
@ -134,20 +143,11 @@ void OpenTypeFeaturesAdd::update_property() {
} }
} }
void OpenTypeFeaturesAdd::_features_menu() {
Size2 size = get_size();
menu->set_position(get_screen_position() + Size2(0, size.height * get_global_transform().get_scale().y));
menu->reset_size();
menu->popup();
}
void OpenTypeFeaturesAdd::_notification(int p_what) { void OpenTypeFeaturesAdd::_notification(int p_what) {
switch (p_what) { switch (p_what) {
case NOTIFICATION_THEME_CHANGED: case NOTIFICATION_THEME_CHANGED:
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
set_label(""); set_icon(get_theme_icon(SNAME("Add"), SNAME("EditorIcons")));
button->set_icon(get_theme_icon(SNAME("Add"), SNAME("EditorIcons")));
button->set_size(get_theme_icon(SNAME("Add"), SNAME("EditorIcons"))->get_size());
} break; } break;
} }
} }
@ -156,6 +156,8 @@ void OpenTypeFeaturesAdd::_bind_methods() {
} }
OpenTypeFeaturesAdd::OpenTypeFeaturesAdd() { OpenTypeFeaturesAdd::OpenTypeFeaturesAdd() {
set_text(TTR("Add Feature..."));
menu = memnew(PopupMenu); menu = memnew(PopupMenu);
add_child(menu); add_child(menu);
@ -171,13 +173,7 @@ OpenTypeFeaturesAdd::OpenTypeFeaturesAdd() {
menu_cu->set_name("CUMenu"); menu_cu->set_name("CUMenu");
menu->add_child(menu_cu); menu->add_child(menu_cu);
button = memnew(Button); connect("pressed", callable_mp(this, &OpenTypeFeaturesAdd::_features_menu));
button->set_flat(true);
button->set_text(RTR("Add feature..."));
button->set_tooltip(RTR("Add feature..."));
add_child(button);
button->connect("pressed", callable_mp(this, &OpenTypeFeaturesAdd::_features_menu));
menu->connect("id_pressed", callable_mp(this, &OpenTypeFeaturesAdd::_add_feature)); menu->connect("id_pressed", callable_mp(this, &OpenTypeFeaturesAdd::_add_feature));
menu_cv->connect("id_pressed", callable_mp(this, &OpenTypeFeaturesAdd::_add_feature)); menu_cv->connect("id_pressed", callable_mp(this, &OpenTypeFeaturesAdd::_add_feature));
menu_ss->connect("id_pressed", callable_mp(this, &OpenTypeFeaturesAdd::_add_feature)); menu_ss->connect("id_pressed", callable_mp(this, &OpenTypeFeaturesAdd::_add_feature));
@ -193,7 +189,8 @@ bool EditorInspectorPluginOpenTypeFeatures::can_handle(Object *p_object) {
bool EditorInspectorPluginOpenTypeFeatures::parse_property(Object *p_object, const Variant::Type p_type, const String &p_path, const PropertyHint p_hint, const String &p_hint_text, const uint32_t p_usage, const bool p_wide) { bool EditorInspectorPluginOpenTypeFeatures::parse_property(Object *p_object, const Variant::Type p_type, const String &p_path, const PropertyHint p_hint, const String &p_hint_text, const uint32_t p_usage, const bool p_wide) {
if (p_path == "opentype_features/_new") { if (p_path == "opentype_features/_new") {
OpenTypeFeaturesAdd *editor = memnew(OpenTypeFeaturesAdd); OpenTypeFeaturesAdd *editor = memnew(OpenTypeFeaturesAdd);
add_property_editor(p_path, editor); editor->setup(p_object);
add_custom_control(editor);
return true; return true;
} else if (p_path.begins_with("opentype_features")) { } else if (p_path.begins_with("opentype_features")) {
OpenTypeFeaturesEditor *editor = memnew(OpenTypeFeaturesEditor); OpenTypeFeaturesEditor *editor = memnew(OpenTypeFeaturesEditor);

8
editor/plugins/ot_features_plugin.h
View file

@ -56,10 +56,10 @@ public:
/*************************************************************************/ /*************************************************************************/
class OpenTypeFeaturesAdd : public EditorProperty { class OpenTypeFeaturesAdd : public Button {
GDCLASS(OpenTypeFeaturesAdd, EditorProperty); GDCLASS(OpenTypeFeaturesAdd, Button);
Button *button = nullptr; Object *edited_object = nullptr;
PopupMenu *menu = nullptr; PopupMenu *menu = nullptr;
PopupMenu *menu_ss = nullptr; PopupMenu *menu_ss = nullptr;
PopupMenu *menu_cv = nullptr; PopupMenu *menu_cv = nullptr;
@ -73,7 +73,7 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
virtual void update_property() override; void setup(Object *p_object);
OpenTypeFeaturesAdd(); OpenTypeFeaturesAdd();
}; };