godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Merge pull request #9482 from Noshyaar/pr-ramp

Browse Source 
Fix shrunk ColorPickers
This commit is contained in:
Rémi Verschelde
2017-07-18 07:52:32 +02:00
committed by GitHub
parent e089989777 668d00ff2d
commit 5a42bbaace
6 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/property_editor.cpp
View File

@@ -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;