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

Merge pull request #10252 from neikeq/pr-fix-some-stuff-<3

Browse source 
Some method fixes
This commit is contained in:
Rémi Verschelde 2017-08-16 18:16:47 +02:00 committed by GitHub
commit 0dd51fc722
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
editor/editor_plugin.cpp
View file

@ -249,8 +249,8 @@ bool EditorPlugin::forward_spatial_gui_input(Camera *p_camera, const Ref<InputEv
}
String EditorPlugin::get_name() const {
if (get_script_instance() && get_script_instance()->has_method("get_name")) {
return get_script_instance()->call("get_name");
if (get_script_instance() && get_script_instance()->has_method("get_plugin_name")) {
return get_script_instance()->call("get_plugin_name");
}
return String();
@ -450,7 +450,7 @@ void EditorPlugin::_bind_methods() {
gizmo.return_val.hint = PROPERTY_HINT_RESOURCE_TYPE;
gizmo.return_val.hint_string = "EditorSpatialGizmo";
ClassDB::add_virtual_method(get_class_static(), gizmo);
ClassDB::add_virtual_method(get_class_static(), MethodInfo(Variant::STRING, "get_name"));
ClassDB::add_virtual_method(get_class_static(), MethodInfo(Variant::STRING, "get_plugin_name"));
ClassDB::add_virtual_method(get_class_static(), MethodInfo(Variant::BOOL, "has_main_screen"));
ClassDB::add_virtual_method(get_class_static(), MethodInfo("make_visible", PropertyInfo(Variant::BOOL, "visible")));
ClassDB::add_virtual_method(get_class_static(), MethodInfo("edit", PropertyInfo(Variant::OBJECT, "object")));

2
scene/gui/item_list.cpp
View file

@ -339,7 +339,7 @@ void ItemList::set_same_column_width(bool p_enable) {
update();
shape_changed = true;
}
int ItemList::is_same_column_width() const {
bool ItemList::is_same_column_width() const {
return same_column_width;
}

2
scene/gui/item_list.h
View file

@ -169,7 +169,7 @@ public:
int get_fixed_column_width() const;
void set_same_column_width(bool p_enable);
int is_same_column_width() const;
bool is_same_column_width() const;
void set_max_text_lines(int p_lines);
int get_max_text_lines() const;