From 668d00ff2d0d0673ae2c02310fd1cdffec4a2940 Mon Sep 17 00:00:00 2001
From: Poommetee Ketson
Date: Tue, 4 Jul 2017 05:52:45 +0700
Subject: Fix ColorPicker to use theme constants

---
 editor/property_editor.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'editor/property_editor.cpp')

diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp
index 8a9fd2cde..7c9420eca 100644
--- a/editor/property_editor.cpp
+++ b/editor/property_editor.cpp
@@ -815,16 +815,12 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant::
 				color_picker = memnew(ColorPicker);
 				add_child(color_picker);
 				color_picker->hide();
-				color_picker->set_area_as_parent_rect();
-				for (int i = 0; i < 4; i++)
-					color_picker->set_margin((Margin)i, 5);
 				color_picker->connect("color_changed", this, "_color_changed");
 			}
 
 			color_picker->show();
 			color_picker->set_edit_alpha(hint != PROPERTY_HINT_COLOR_NO_ALPHA);
 			color_picker->set_pick_color(v);
-			set_size(Size2(307 * EDSCALE, 460 * EDSCALE));
 			color_picker->set_focus_on_line_edit();
 			/*
 			int ofs=80;
-- 
cgit v1.2.3-70-g09d2