godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
editor/reparent_dialog.cpp
View File

@@ -28,25 +28,24 @@
/*************************************************************************/
#include "reparent_dialog.h"
#include "scene/gui/label.h"
#include "scene/gui/box_container.h"
#include "scene/gui/label.h"
#include "print_string.h"
void ReparentDialog::_notification(int p_what) {
if (p_what==NOTIFICATION_ENTER_TREE) {
if (p_what == NOTIFICATION_ENTER_TREE) {
connect("confirmed", this,"_reparent");
connect("confirmed", this, "_reparent");
}
if (p_what==NOTIFICATION_EXIT_TREE) {
if (p_what == NOTIFICATION_EXIT_TREE) {
disconnect("confirmed", this,"_reparent");
disconnect("confirmed", this, "_reparent");
}
if (p_what==NOTIFICATION_DRAW) {
if (p_what == NOTIFICATION_DRAW) {
//RID ci = get_canvas_item();
//get_stylebox("panel","PopupMenu")->draw(ci,Rect2(Point2(),get_size()));
@@ -56,67 +55,60 @@ void ReparentDialog::_notification(int p_what) {
void ReparentDialog::_cancel() {
hide();
}
void ReparentDialog::_reparent() {
if (tree->get_selected()) {
emit_signal("reparent",tree->get_selected()->get_path(),keep_transform->is_pressed());
emit_signal("reparent", tree->get_selected()->get_path(), keep_transform->is_pressed());
hide();
}
}
void ReparentDialog::set_current(const Set<Node*>& p_selection) {
void ReparentDialog::set_current(const Set<Node *> &p_selection) {
tree->set_marked(p_selection,false,false);
tree->set_marked(p_selection, false, false);
//tree->set_selected(p_node->get_parent());
}
void ReparentDialog::_bind_methods() {
ObjectTypeDB::bind_method("_reparent",&ReparentDialog::_reparent);
ObjectTypeDB::bind_method("_cancel",&ReparentDialog::_cancel);
ObjectTypeDB::bind_method("_reparent", &ReparentDialog::_reparent);
ObjectTypeDB::bind_method("_cancel", &ReparentDialog::_cancel);
ADD_SIGNAL( MethodInfo("reparent",PropertyInfo(Variant::NODE_PATH,"path"),PropertyInfo(Variant::BOOL,"keep_global_xform")));
ADD_SIGNAL(MethodInfo("reparent", PropertyInfo(Variant::NODE_PATH, "path"), PropertyInfo(Variant::BOOL, "keep_global_xform")));
}
ReparentDialog::ReparentDialog() {
set_title(TTR("Reparent Node"));
VBoxContainer *vbc = memnew( VBoxContainer );
VBoxContainer *vbc = memnew(VBoxContainer);
add_child(vbc);
set_child_rect(vbc);
tree = memnew( SceneTreeEditor(false) );
tree = memnew(SceneTreeEditor(false));
tree->set_show_enabled_subscene(true);
vbc->add_margin_child(TTR("Reparent Location (Select new Parent):"),tree,true);
vbc->add_margin_child(TTR("Reparent Location (Select new Parent):"), tree, true);
tree->get_scene_tree()->connect("item_activated",this,"_reparent");
tree->get_scene_tree()->connect("item_activated", this, "_reparent");
//Label *label = memnew( Label );
//label->set_pos( Point2( 15,8) );
//label->set_text("Reparent Location (Select new Parent):");
keep_transform = memnew( CheckBox );
keep_transform = memnew(CheckBox);
keep_transform->set_text(TTR("Keep Global Transform"));
keep_transform->set_pressed(true);
vbc->add_child(keep_transform);
//vbc->add_margin_child("Options:",node_only);
//cancel->connect("pressed", this,"_cancel");
get_ok()->set_text(TTR("Reparent"));
}
ReparentDialog::~ReparentDialog()
{
ReparentDialog::~ReparentDialog() {
}