Add a visual editor to color picker.
This commit is contained in:
MarianoGNU
parent
3c6dd5749d
commit
dc7755ffcd
|
|
@ -28,6 +28,8 @@
|
|||
/*************************************************************************/
|
||||
#include "color_picker.h"
|
||||
|
||||
#include "scene/gui/separator.h"
|
||||
#include "os/os.h"
|
||||
|
||||
|
||||
|
||||
|
|
@ -40,13 +42,9 @@ void ColorPicker::_notification(int p_what) {
|
|||
_update_controls();
|
||||
} break;
|
||||
|
||||
/* case NOTIFICATION_DRAW: {
|
||||
|
||||
int w = get_constant("color_width");
|
||||
int h = ms.height;
|
||||
VisualServer::get_singleton()->canvas_item_add_rect(get_canvas_item(),Rect2(0,0,w,h),color);
|
||||
|
||||
} break;*/
|
||||
case NOTIFICATION_ENTER_TREE: {
|
||||
btn_pick->set_icon(get_icon("screen_picker", "ColorPicker"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -68,6 +66,9 @@ void ColorPicker::_update_controls() {
|
|||
void ColorPicker::set_color(const Color& p_color) {
|
||||
|
||||
color=p_color;
|
||||
h=color.get_h();
|
||||
s=color.get_s();
|
||||
v=color.get_v();
|
||||
_update_color();
|
||||
|
||||
}
|
||||
|
|
@ -77,7 +78,7 @@ void ColorPicker::set_edit_alpha(bool p_show) {
|
|||
edit_alpha=p_show;
|
||||
_update_controls();
|
||||
_update_color();
|
||||
color_box->update();
|
||||
sample->update();
|
||||
}
|
||||
|
||||
bool ColorPicker::is_editing_alpha() const {
|
||||
|
|
@ -90,35 +91,14 @@ void ColorPicker::_value_changed(double) {
|
|||
if (updating)
|
||||
return;
|
||||
|
||||
switch(mode) {
|
||||
|
||||
case MODE_RGB: {
|
||||
|
||||
for(int i=0;i<4;i++) {
|
||||
color.components[i] = scroll[i]->get_val() / 255.0;
|
||||
}
|
||||
|
||||
} break;
|
||||
case MODE_HSV: {
|
||||
|
||||
color.set_hsv( CLAMP(scroll[0]->get_val()/359,0,0.9972), scroll[1]->get_val()/100, scroll[2]->get_val()/100 );
|
||||
color.a=scroll[3]->get_val()/100.0;
|
||||
|
||||
} break;
|
||||
case MODE_RAW: {
|
||||
|
||||
for(int i=0;i<4;i++) {
|
||||
color.components[i] = scroll[i]->get_val();
|
||||
}
|
||||
|
||||
} break;
|
||||
|
||||
for(int i=0;i<3;i++) {
|
||||
color.components[i] = scroll[i]->get_val()/(raw_mode_enabled?1.0:255.0);
|
||||
}
|
||||
|
||||
color.components[3] = scroll[3]->get_val()/255.0;
|
||||
|
||||
html->set_text(color.to_html(edit_alpha && color.a<1));
|
||||
|
||||
color_box->update();
|
||||
sample->update();
|
||||
|
||||
emit_signal("color_changed",color);
|
||||
|
||||
|
|
@ -138,62 +118,18 @@ void ColorPicker::_update_color() {
|
|||
|
||||
updating=true;
|
||||
|
||||
switch(mode) {
|
||||
|
||||
case MODE_RAW: {
|
||||
|
||||
static const char*_lt[4]={"R","G","B","A"};
|
||||
|
||||
for(int i=0;i<4;i++) {
|
||||
scroll[i]->set_max(255);
|
||||
scroll[i]->set_step(0.01);
|
||||
scroll[i]->set_val(color.components[i]);
|
||||
labels[i]->set_text(_lt[i]);
|
||||
}
|
||||
} break;
|
||||
case MODE_RGB: {
|
||||
|
||||
static const char*_lt[4]={"R","G","B","A"};
|
||||
|
||||
for(int i=0;i<4;i++) {
|
||||
scroll[i]->set_max(255);
|
||||
scroll[i]->set_step(1);
|
||||
scroll[i]->set_val(color.components[i]*255);
|
||||
labels[i]->set_text(_lt[i]);
|
||||
}
|
||||
|
||||
} break;
|
||||
case MODE_HSV: {
|
||||
|
||||
static const char*_lt[4]={"H","S","V","A"};
|
||||
|
||||
for(int i=0;i<4;i++) {
|
||||
labels[i]->set_text(_lt[i]);
|
||||
}
|
||||
|
||||
scroll[0]->set_max(359);
|
||||
scroll[0]->set_step(0.01);
|
||||
scroll[0]->set_val( color.get_h()*359 );
|
||||
|
||||
scroll[1]->set_max(100);
|
||||
scroll[1]->set_step(0.01);
|
||||
scroll[1]->set_val( color.get_s()*100 );
|
||||
|
||||
scroll[2]->set_max(100);
|
||||
scroll[2]->set_step(0.01);
|
||||
scroll[2]->set_val( color.get_v()*100 );
|
||||
|
||||
scroll[3]->set_max(100);
|
||||
scroll[3]->set_step(0.01);
|
||||
scroll[3]->set_val( color.a*100);
|
||||
|
||||
} break;
|
||||
for(int i=0;i<4;i++) {
|
||||
scroll[i]->set_max(255);
|
||||
scroll[i]->set_step(0.01);
|
||||
if (raw_mode_enabled && i != 3)
|
||||
scroll[i]->set_val(color.components[i]);
|
||||
else
|
||||
scroll[i]->set_val(color.components[i]*255);
|
||||
}
|
||||
|
||||
|
||||
html->set_text(color.to_html(edit_alpha && color.a<1));
|
||||
|
||||
color_box->update();
|
||||
sample->update();
|
||||
updating=false;
|
||||
}
|
||||
|
||||
|
|
@ -203,38 +139,91 @@ Color ColorPicker::get_color() const {
|
|||
}
|
||||
|
||||
|
||||
void ColorPicker::set_mode(Mode p_mode) {
|
||||
|
||||
ERR_FAIL_INDEX(p_mode,3);
|
||||
mode=p_mode;
|
||||
if (mode_box->get_selected()!=p_mode)
|
||||
mode_box->select(p_mode);
|
||||
void ColorPicker::set_raw_mode(bool p_enabled) {
|
||||
|
||||
if (raw_mode_enabled==p_enabled)
|
||||
return;
|
||||
raw_mode_enabled=p_enabled;
|
||||
if (btn_mode->is_pressed()!=p_enabled)
|
||||
btn_mode->set_pressed(p_enabled);
|
||||
|
||||
_update_controls();
|
||||
_update_color();
|
||||
}
|
||||
|
||||
ColorPicker::Mode ColorPicker::get_mode() const {
|
||||
bool ColorPicker::is_raw_mode() const {
|
||||
|
||||
return mode;
|
||||
return raw_mode_enabled;
|
||||
}
|
||||
|
||||
void ColorPicker::_color_box_draw() {
|
||||
void ColorPicker::_sample_draw() {
|
||||
sample->draw_rect(Rect2(Point2(),Size2(256,20)),color);
|
||||
}
|
||||
|
||||
color_box->draw_rect( Rect2( Point2(), color_box->get_size()), color);
|
||||
void ColorPicker::_uv_input(const InputEvent &ev)
|
||||
{
|
||||
if (ev.type == InputEvent::MOUSE_BUTTON) {
|
||||
const InputEventMouseButton &bev = ev.mouse_button;
|
||||
if (bev.pressed) {
|
||||
changing_color = true;
|
||||
float x = CLAMP((float)bev.x,0,256);
|
||||
float y = CLAMP((float)bev.y,0,256);
|
||||
s=x/256;
|
||||
v=1.0-y/256.0;
|
||||
} else {
|
||||
changing_color = false;
|
||||
}
|
||||
} else if (ev.type == InputEvent::MOUSE_MOTION) {
|
||||
const InputEventMouse &bev = ev.mouse_motion;
|
||||
if (!changing_color)
|
||||
return;
|
||||
float x = CLAMP((float)bev.x,0,256);
|
||||
float y = CLAMP((float)bev.y,0,256);
|
||||
s=x/256;
|
||||
v=1.0-y/256.0;
|
||||
}
|
||||
color.set_hsv(h,s,v,color.a);
|
||||
_update_color();
|
||||
emit_signal("color_changed", color);
|
||||
}
|
||||
|
||||
void ColorPicker::_w_input(const InputEvent &ev)
|
||||
{
|
||||
if (ev.type == InputEvent::MOUSE_BUTTON) {
|
||||
const InputEventMouseButton &bev = ev.mouse_button;
|
||||
if (bev.pressed) {
|
||||
changing_color = true;
|
||||
h=((float)bev.y)/256.0;
|
||||
|
||||
} else {
|
||||
changing_color = false;
|
||||
}
|
||||
} else if (ev.type == InputEvent::MOUSE_MOTION) {
|
||||
const InputEventMouse &bev = ev.mouse_motion;
|
||||
if (!changing_color)
|
||||
return;
|
||||
float y = CLAMP((float)bev.y,0,256);
|
||||
h=1.0-y/256.0;
|
||||
}
|
||||
uv_material->set_shader_param("H", h);
|
||||
color.set_hsv(h,s,v,color.a);
|
||||
_update_color();
|
||||
emit_signal("color_changed", color);
|
||||
}
|
||||
|
||||
void ColorPicker::_bind_methods() {
|
||||
|
||||
ObjectTypeDB::bind_method(_MD("set_color","color"),&ColorPicker::set_color);
|
||||
ObjectTypeDB::bind_method(_MD("get_color"),&ColorPicker::get_color);
|
||||
ObjectTypeDB::bind_method(_MD("set_mode","mode"),&ColorPicker::set_mode);
|
||||
ObjectTypeDB::bind_method(_MD("get_mode"),&ColorPicker::get_mode);
|
||||
ObjectTypeDB::bind_method(_MD("set_raw_mode","mode"),&ColorPicker::set_raw_mode);
|
||||
ObjectTypeDB::bind_method(_MD("is_raw_mode"),&ColorPicker::is_raw_mode);
|
||||
ObjectTypeDB::bind_method(_MD("set_edit_alpha","show"),&ColorPicker::set_edit_alpha);
|
||||
ObjectTypeDB::bind_method(_MD("is_editing_alpha"),&ColorPicker::is_editing_alpha);
|
||||
ObjectTypeDB::bind_method(_MD("_value_changed"),&ColorPicker::_value_changed);
|
||||
ObjectTypeDB::bind_method(_MD("_html_entered"),&ColorPicker::_html_entered);
|
||||
ObjectTypeDB::bind_method(_MD("_color_box_draw"),&ColorPicker::_color_box_draw);
|
||||
ObjectTypeDB::bind_method(_MD("_sample_draw"),&ColorPicker::_sample_draw);
|
||||
ObjectTypeDB::bind_method(_MD("_uv_input"),&ColorPicker::_uv_input);
|
||||
ObjectTypeDB::bind_method(_MD("_w_input"),&ColorPicker::_w_input);
|
||||
|
||||
ADD_SIGNAL( MethodInfo("color_changed",PropertyInfo(Variant::COLOR,"color")));
|
||||
}
|
||||
|
|
@ -242,29 +231,60 @@ void ColorPicker::_bind_methods() {
|
|||
|
||||
|
||||
|
||||
ColorPicker::ColorPicker() {
|
||||
ColorPicker::ColorPicker() :
|
||||
BoxContainer(true) {
|
||||
|
||||
|
||||
//edit_alpha=false;
|
||||
updating=true;
|
||||
edit_alpha=true;
|
||||
raw_mode_enabled=false;
|
||||
changing_color=false;
|
||||
|
||||
HBoxContainer *hb_smpl = memnew( HBoxContainer );
|
||||
btn_pick = memnew( ToolButton );
|
||||
sample = memnew( TextureFrame );
|
||||
sample->set_h_size_flags(SIZE_EXPAND_FILL);
|
||||
sample->connect("draw",this,"_sample_draw");
|
||||
|
||||
hb_smpl->add_child(sample);
|
||||
hb_smpl->add_child(btn_pick);
|
||||
add_child(hb_smpl);
|
||||
|
||||
HBoxContainer *hb_edit = memnew( HBoxContainer );
|
||||
|
||||
uv_edit= memnew ( TextureFrame );
|
||||
Image i(256, 256, false, Image::FORMAT_RGB);
|
||||
for (int y=0;y<256;y++)
|
||||
for (int x=0;x<256;x++)
|
||||
i.put_pixel(x,y,Color());
|
||||
Ref<ImageTexture> t;
|
||||
t.instance();
|
||||
t->create_from_image(i);
|
||||
uv_edit->set_texture(t);
|
||||
uv_edit->set_ignore_mouse(false);
|
||||
uv_edit->set_custom_minimum_size(Size2(256,256));
|
||||
uv_edit->connect("input_event", this, "_uv_input");
|
||||
|
||||
add_child(hb_edit);
|
||||
w_edit= memnew( TextureFrame );
|
||||
i = Image(15, 256, false, Image::FORMAT_RGB);
|
||||
for (int y=0;y<256;y++)
|
||||
for (int x=0;x<15;x++)
|
||||
i.put_pixel(x,y,Color());
|
||||
Ref<ImageTexture> tw;
|
||||
tw.instance();
|
||||
tw->create_from_image(i);
|
||||
w_edit->set_texture(tw);
|
||||
w_edit->set_ignore_mouse(false);
|
||||
w_edit->set_custom_minimum_size(Size2(15,256));
|
||||
w_edit->connect("input_event", this, "_w_input");
|
||||
|
||||
hb_edit->add_child(uv_edit);
|
||||
hb_edit->add_child(memnew( VSeparator ));
|
||||
hb_edit->add_child(w_edit);
|
||||
|
||||
VBoxContainer *vbl = memnew( VBoxContainer );
|
||||
add_child(vbl);
|
||||
|
||||
mode_box = memnew( OptionButton );
|
||||
mode_box->add_item("RGB");
|
||||
mode_box->add_item("HSV");
|
||||
mode_box->add_item("RAW");
|
||||
mode_box->connect("item_selected",this,"set_mode");
|
||||
|
||||
color_box=memnew( Control );
|
||||
color_box->set_v_size_flags(SIZE_EXPAND_FILL);
|
||||
vbl->add_child(color_box);
|
||||
color_box->connect("draw",this,"_color_box_draw");
|
||||
|
||||
vbl->add_child(mode_box);
|
||||
|
||||
|
||||
VBoxContainer *vbr = memnew( VBoxContainer );
|
||||
add_child(vbr);
|
||||
|
|
@ -294,10 +314,14 @@ ColorPicker::ColorPicker() {
|
|||
|
||||
vbr->add_child(hbc);
|
||||
|
||||
|
||||
}
|
||||
|
||||
HBoxContainer *hhb = memnew( HBoxContainer );
|
||||
|
||||
btn_mode = memnew( CheckButton );
|
||||
btn_mode->set_text("RAW Mode");
|
||||
btn_mode->connect("toggled", this, "set_raw_mode");
|
||||
hhb->add_child(btn_mode);
|
||||
vbr->add_child(hhb);
|
||||
html_num = memnew( Label );
|
||||
hhb->add_child(html_num);
|
||||
|
|
@ -309,11 +333,75 @@ ColorPicker::ColorPicker() {
|
|||
html->set_h_size_flags(SIZE_EXPAND_FILL);
|
||||
|
||||
|
||||
mode=MODE_RGB;
|
||||
_update_controls();
|
||||
_update_color();
|
||||
updating=false;
|
||||
|
||||
const char *uv_shader_code=
|
||||
"vec3 nd1sl2=vec3(UV,0);\n"
|
||||
"uniform float H=0;\n"
|
||||
"float nd4sl0=H;\n"
|
||||
"float nd7sl0=nd1sl2.x;\n"
|
||||
"float nd7sl1=nd1sl2.y;\n"
|
||||
"float nd7sl2=nd1sl2.z;\n"
|
||||
"float nd2sl1def=-1;\n"
|
||||
"float nd2sl0=nd7sl1*nd2sl1def;\n"
|
||||
"float nd6sl1def=1;\n"
|
||||
"float nd6sl0=nd2sl0+nd6sl1def;\n"
|
||||
"vec3 nd3sl0=vec3(nd4sl0,nd7sl0,nd6sl0);\n"
|
||||
"vec3 nd5sl0;\n"
|
||||
"{\n"
|
||||
" vec3 c = nd3sl0;\n"
|
||||
" vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);\n"
|
||||
" vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);\n"
|
||||
" nd5sl0=c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);\n"
|
||||
"}\n"
|
||||
"COLOR.rgb=nd5sl0;";
|
||||
|
||||
const char *w_shader_code=
|
||||
"vec3 nd1sl2=vec3(UV,0);\n"
|
||||
"float nd2sl0=nd1sl2.x;\n"
|
||||
"float nd2sl1=nd1sl2.y;\n"
|
||||
"float nd2sl2=nd1sl2.z;\n"
|
||||
"float nd3sl1def=1;\n"
|
||||
"float nd3sl2def=1;\n"
|
||||
"vec3 nd3sl0=vec3(nd2sl1,nd3sl1def,nd3sl2def);\n"
|
||||
"vec3 nd6sl0;\n"
|
||||
"{\n"
|
||||
" vec3 c = nd3sl0;\n"
|
||||
" vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);\n"
|
||||
" vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);\n"
|
||||
" nd6sl0=c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);\n"
|
||||
"}\n"
|
||||
"COLOR.rgb=nd6sl0;";
|
||||
|
||||
set_color(Color(1,1,1));
|
||||
|
||||
uv_material.instance();
|
||||
Ref<Shader> s_uv = memnew( Shader(Shader::MODE_CANVAS_ITEM) );
|
||||
s_uv->set_code("", uv_shader_code, "");
|
||||
uv_material->set_shader(s_uv);
|
||||
uv_material->set_shader_param("H", h);
|
||||
|
||||
w_material.instance();
|
||||
Ref<Shader> s_w = (memnew( Shader(Shader::MODE_CANVAS_ITEM) ));
|
||||
s_w->set_code("", w_shader_code, "");
|
||||
w_material->set_shader(s_w);
|
||||
|
||||
uv_edit->set_material(uv_material);
|
||||
w_edit->set_material(w_material);
|
||||
|
||||
i.create(256,20,false,Image::FORMAT_RGB);
|
||||
for (int y=0;y<20;y++)
|
||||
for(int x=0;x<256;x++)
|
||||
if ((x/4+y/4)%2)
|
||||
i.put_pixel(x,y,Color(1,1,1));
|
||||
else
|
||||
i.put_pixel(x,y,Color(0.6,0.6,0.6));
|
||||
Ref<ImageTexture> t_smpl;
|
||||
t_smpl.instance();
|
||||
t_smpl->create_from_image(i);
|
||||
sample->set_texture(t_smpl);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -331,7 +419,7 @@ void ColorPickerButton::_color_changed(const Color& p_color) {
|
|||
|
||||
void ColorPickerButton::pressed() {
|
||||
|
||||
Size2 ms = Size2(350, picker->get_combined_minimum_size().height+10);
|
||||
Size2 ms = Size2(300, picker->get_combined_minimum_size().height+10);
|
||||
popup->set_pos(get_global_pos()-Size2(0,ms.height));
|
||||
popup->set_size(ms);
|
||||
popup->popup();
|
||||
|
|
|
|||
|
|
@ -36,25 +36,24 @@
|
|||
#include "scene/gui/button.h"
|
||||
#include "scene/gui/popup.h"
|
||||
#include "scene/gui/box_container.h"
|
||||
#include "scene/gui/option_button.h"
|
||||
#include "scene/gui/texture_frame.h"
|
||||
#include "scene/gui/tool_button.h"
|
||||
#include "scene/gui/check_button.h"
|
||||
#include "scene/resources/material.h"
|
||||
|
||||
class ColorPicker : public HBoxContainer {
|
||||
class ColorPicker : public BoxContainer {
|
||||
|
||||
OBJ_TYPE(ColorPicker,HBoxContainer);
|
||||
public:
|
||||
OBJ_TYPE(ColorPicker,BoxContainer);
|
||||
|
||||
enum Mode {
|
||||
MODE_RGB,
|
||||
MODE_HSV,
|
||||
MODE_RAW
|
||||
};
|
||||
private:
|
||||
|
||||
Mode mode;
|
||||
|
||||
OptionButton *mode_box;
|
||||
|
||||
Control *color_box;
|
||||
TextureFrame *uv_edit;
|
||||
TextureFrame *w_edit;
|
||||
TextureFrame *sample;
|
||||
ToolButton *btn_pick;
|
||||
CheckButton *btn_mode;
|
||||
Ref<CanvasItemMaterial> uv_material;
|
||||
Ref<CanvasItemMaterial> w_material;
|
||||
HSlider *scroll[4];
|
||||
SpinBox *values[4];
|
||||
Label *labels[4];
|
||||
|
|
@ -64,13 +63,19 @@ private:
|
|||
Size2i ms;
|
||||
|
||||
Color color;
|
||||
bool raw_mode_enabled;
|
||||
bool updating;
|
||||
bool changing_color;
|
||||
float h,s,v;
|
||||
|
||||
void _html_entered(const String& p_html);
|
||||
void _value_changed(double);
|
||||
void _update_controls();
|
||||
void _update_color();
|
||||
void _color_box_draw();
|
||||
void _sample_draw();
|
||||
|
||||
void _uv_input(const InputEvent& p_input);
|
||||
void _w_input(const InputEvent& p_input);
|
||||
protected:
|
||||
|
||||
void _notification(int);
|
||||
|
|
@ -82,16 +87,14 @@ public:
|
|||
|
||||
void set_color(const Color& p_color);
|
||||
Color get_color() const;
|
||||
|
||||
void set_mode(Mode p_mode);
|
||||
Mode get_mode() const;
|
||||
|
||||
void set_raw_mode(bool p_enabled);
|
||||
bool is_raw_mode() const;
|
||||
|
||||
|
||||
ColorPicker();
|
||||
};
|
||||
|
||||
VARIANT_ENUM_CAST( ColorPicker::Mode );
|
||||
|
||||
class ColorPickerButton : public Button {
|
||||
|
||||
OBJ_TYPE(ColorPickerButton,Button);
|
||||
|
|
|
|||
|
|
@ -766,7 +766,8 @@ void make_default_theme() {
|
|||
t->set_constant("color_width","ColorPicker", 100);
|
||||
t->set_constant("label_width","ColorPicker", 20);
|
||||
t->set_constant("hseparator","ColorPicker", 4);
|
||||
|
||||
|
||||
t->set_icon("screen_picker","ColorPicker", make_icon( icon_color_pick_png ) );
|
||||
|
||||
|
||||
// TooltipPanel
|
||||
|
|
|
|||
BIN
scene/resources/default_theme/icon_color_pick.png
Normal file
BIN
scene/resources/default_theme/icon_color_pick.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 646 B |
|
|
@ -184,6 +184,11 @@ static const unsigned char icon_close_png[]={
|
|||
};
|
||||
|
||||
|
||||
static const unsigned char icon_color_pick_png[]={
|
||||
0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x11,0x0,0x0,0xb,0x11,0x1,0x7f,0x64,0x5f,0x91,0x0,0x0,0x0,0x18,0x74,0x45,0x58,0x74,0x53,0x6f,0x66,0x74,0x77,0x61,0x72,0x65,0x0,0x70,0x61,0x69,0x6e,0x74,0x2e,0x6e,0x65,0x74,0x20,0x34,0x2e,0x30,0x2e,0x36,0xfc,0x8c,0x63,0xdf,0x0,0x0,0x1,0xf7,0x49,0x44,0x41,0x54,0x38,0x4f,0x8d,0x90,0xbd,0x6b,0x53,0x51,0x18,0xc6,0xaf,0x26,0xed,0x62,0x70,0x71,0xd0,0xc1,0x2f,0x70,0xa9,0xda,0x4d,0xc7,0x8e,0xd6,0x42,0xc5,0x52,0xa5,0x42,0xa1,0xa4,0xb6,0x20,0x75,0x50,0xf4,0x52,0x41,0x1d,0x6a,0x87,0x96,0xfe,0x1,0x42,0xa1,0x20,0x52,0x71,0x56,0x50,0xf3,0xd5,0x94,0x24,0xed,0x50,0x5d,0xc4,0x41,0xa9,0x70,0xd3,0xc4,0xe7,0x9c,0xa0,0xc5,0xf,0x1c,0x2,0x6,0x29,0x4d,0xe2,0x7d,0x7d,0x4e,0x72,0xc,0xe9,0x7,0xb5,0xf,0xfc,0x48,0xee,0xcd,0xf3,0x7b,0xcf,0x7b,0xe2,0xfc,0x2f,0xc5,0x62,0x31,0x98,0xc8,0xfd,0x8,0x5c,0x8c,0xa1,0xa5,0x3f,0x81,0xe0,0x8d,0x14,0x4e,0xdc,0xcd,0x60,0x6a,0x64,0x1e,0x3,0x3d,0x31,0x84,0x6c,0x6d,0x6b,0x6,0xe6,0x10,0x1c,0x4a,0xe2,0xc0,0xf3,0x8f,0xab,0x7b,0x87,0x53,0x2a,0x40,0xf9,0x24,0xe5,0xa7,0xf7,0x17,0xf0,0xe7,0x5e,0x6,0x55,0x3e,0x7f,0xee,0x8c,0xe0,0xa0,0xad,0x3b,0x8e,0x88,0x34,0x30,0x19,0x4c,0x22,0x70,0x2b,0x85,0xa3,0x7d,0x71,0x1c,0xb9,0x1c,0x47,0x68,0x34,0x8d,0x35,0xca,0xe2,0xa6,0x21,0xe1,0x39,0xf8,0x5d,0x11,0xac,0x9f,0x8b,0xe0,0x71,0xad,0x6c,0xd2,0x2c,0x9b,0xf4,0xc6,0x70,0xfc,0xda,0x3c,0xd6,0x2e,0xc5,0xf0,0x75,0x38,0x89,0x99,0xb1,0x5,0xf8,0x77,0xd2,0xf0,0xaf,0xc4,0x51,0x3d,0x1f,0x41,0x99,0xb2,0x22,0xa7,0x6d,0x7d,0xeb,0x0,0x9e,0x70,0xa6,0x27,0x8a,0x32,0xd7,0x14,0x6e,0x20,0xdc,0xc0,0xe7,0xea,0x3e,0x4f,0x2f,0x71,0xc0,0x7,0xca,0x61,0xd2,0x62,0xeb,0xf5,0x1,0xcd,0x59,0xfe,0xa4,0xdd,0x47,0x6f,0x21,0xdd,0x51,0xf8,0x1c,0xe2,0xf3,0x2a,0xc2,0x3f,0xce,0x6c,0xf0,0x8e,0xc3,0x7,0x29,0xef,0xb3,0xd5,0x7a,0x9a,0x7,0x14,0xa,0x85,0x3e,0x52,0xc9,0x2b,0x5d,0x19,0x5d,0xc4,0x2c,0xcb,0x25,0xb3,0x9,0x87,0xc9,0x85,0x28,0xbe,0xf3,0xfb,0x31,0xbe,0xdb,0x63,0xeb,0xf5,0xfc,0xbb,0x2,0xc5,0xe,0x52,0x22,0x42,0x6e,0xba,0x8b,0xd8,0x3f,0xf5,0x46,0xe5,0x79,0xaa,0x50,0x32,0x54,0x49,0xe7,0xb6,0x3,0x28,0xb4,0x91,0xa2,0x95,0x27,0x49,0x90,0x3c,0xcb,0x42,0xcb,0xf8,0x92,0xfa,0x6d,0x65,0x9f,0xbc,0x22,0xad,0x56,0xad,0x87,0xc5,0x10,0xf1,0x88,0x91,0x9f,0x90,0x9a,0x6c,0x9f,0x7f,0x26,0x96,0xf5,0x59,0x4a,0x2e,0x79,0x49,0x4e,0x91,0x8d,0x1b,0xb0,0xf4,0x42,0xe7,0xb5,0x60,0x36,0xb7,0x8a,0xeb,0x5e,0xb8,0x49,0x36,0xd7,0xe9,0x30,0x1b,0x1a,0x89,0xb4,0x6e,0x27,0xf7,0xea,0xf7,0x4a,0x30,0xb1,0x52,0x46,0xd8,0x2b,0xe3,0x41,0xf6,0xcb,0x66,0x79,0x33,0x1b,0xc2,0x92,0xa7,0x1e,0xe6,0x4,0x57,0xbd,0x75,0xb8,0xd9,0x5f,0x5a,0xeb,0x1d,0x65,0x43,0x23,0x2c,0xb5,0xab,0xc,0x4,0x23,0x9e,0xe0,0xb6,0x57,0xd1,0x2b,0x35,0xf9,0xdb,0x4e,0xb2,0xa1,0x11,0x16,0xf,0x61,0x3a,0x57,0x55,0xaf,0x61,0x44,0x43,0x8a,0x1c,0xb6,0x3f,0xef,0x2e,0x14,0xda,0xc9,0x98,0xf9,0xb4,0xaf,0x76,0x19,0xc7,0xf9,0xb,0x8e,0xb3,0xf3,0x95,0xda,0x15,0xd3,0x79,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
|
||||
};
|
||||
|
||||
|
||||
static const unsigned char icon_folder_png[]={
|
||||
0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0xf,0x14,0x33,0x39,0x1,0xd2,0x43,0x4c,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x36,0x49,0x44,0x41,0x54,0x38,0x8d,0xc5,0x92,0xcd,0x4a,0xc3,0x40,0x14,0x85,0xbf,0x7b,0x67,0x12,0x48,0x3,0x12,0x62,0x45,0xfa,0x30,0x7d,0x5,0x5d,0xfa,0x8,0xbe,0x88,0x3e,0x45,0x5f,0xc1,0x9d,0x4b,0x77,0x3e,0x81,0x2e,0xa4,0x15,0xa5,0x10,0xb2,0xc8,0xa2,0x9b,0x41,0x2c,0x62,0x4c,0x66,0x5c,0x34,0x8a,0x3f,0x95,0x26,0x2b,0xf,0xc,0xcc,0x9d,0x3b,0xe7,0xce,0x39,0x87,0x81,0xff,0x86,0x14,0x45,0x11,0xb6,0x35,0xe2,0x38,0xbe,0x9c,0x4c,0x26,0x47,0xce,0xb9,0x78,0x4b,0x3b,0x64,0x59,0xf6,0x6,0x20,0x65,0x59,0x56,0xde,0xfb,0x43,0x40,0x80,0x0,0x34,0xdd,0xa5,0x28,0x49,0x92,0x73,0x11,0x79,0xf9,0x49,0x16,0x91,0xd5,0x78,0x3c,0x9e,0x1,0x58,0x63,0x4c,0xe9,0xbd,0x3f,0x0,0xc,0x20,0xa3,0xd1,0xe8,0x2c,0x84,0x10,0x1,0x88,0xc8,0x6b,0x37,0xf8,0x9b,0xea,0x10,0xc2,0xa7,0x2a,0xa9,0xaa,0xea,0xa2,0xae,0xeb,0x63,0x40,0xd3,0x34,0x3d,0x5d,0xaf,0xd7,0xb3,0xde,0xfe,0x45,0x9e,0xd4,0x18,0x53,0x0,0x1e,0xd0,0x10,0x42,0xda,0x97,0xc,0x78,0x55,0xad,0x54,0x44,0x96,0x80,0xfd,0xf0,0x37,0x64,0x80,0x31,0x66,0xa1,0xaa,0xfa,0x8,0x68,0x77,0xb8,0x7,0xd4,0x83,0x6,0x88,0xc8,0x3,0x80,0x31,0x66,0xde,0x34,0xcd,0x94,0x4d,0x98,0x7d,0x10,0xab,0xea,0xad,0xe6,0x79,0xbe,0x4,0x88,0xa2,0xe8,0xba,0xae,0xeb,0xe9,0x17,0x35,0x3b,0xa1,0xaa,0x37,0xf6,0x4b,0x71,0x7,0x24,0x7d,0xc9,0x0,0x79,0x9e,0xcf,0x2d,0x80,0x88,0x3c,0xf,0x79,0x99,0x4d,0xd8,0x1e,0xba,0xf4,0x55,0x75,0xd5,0xed,0xdb,0x6e,0xed,0x42,0x63,0xad,0xbd,0x7,0xb0,0xce,0x39,0x6d,0xdb,0xf6,0x44,0x55,0x17,0x49,0x92,0xec,0xff,0xf1,0xfb,0x7e,0x29,0x50,0xd5,0x2b,0xe7,0x9c,0x8,0x80,0x73,0xce,0x74,0x92,0xa2,0x1,0x36,0xda,0x2c,0xcb,0xda,0x77,0xe3,0x5,0x64,0xf1,0xba,0x53,0xe9,0x44,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
|
||||
};
|
||||
|
|
|
|||
|
|
@ -595,7 +595,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
|
|||
color_picker->show();
|
||||
color_picker->set_edit_alpha(hint!=PROPERTY_HINT_COLOR_NO_ALPHA);
|
||||
color_picker->set_color(v);
|
||||
set_size( Size2(350, color_picker->get_combined_minimum_size().height+10));
|
||||
set_size( Size2(300, color_picker->get_combined_minimum_size().height+10));
|
||||
/*
|
||||
int ofs=80;
|
||||
int m=10;
|
||||
|
|
|
|||
Loading…
Reference in a new issue