seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9192 from remorse107/master

Browse Source 
Color Picker Fixed Appearance
This commit is contained in:
Rémi Verschelde
2017-06-15 19:17:11 +02:00
committed by GitHub
parent 0a339f14a8 61feec28cf
commit 7b1f1dbf37
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scene/gui/color_picker.cpp
View File

@ -156,6 +156,8 @@ void ColorPicker::_update_color() {
_update_text_value(); _update_text_value();
sample->update(); sample->update();
uv_edit->update();
w_edit->update();
updating = false; updating = false;
} }
@ -263,10 +265,10 @@ void ColorPicker::_hsv_draw(int p_wich, Control *c) {
points.push_back(c->get_size()); points.push_back(c->get_size());
points.push_back(Vector2(0, c->get_size().y)); points.push_back(Vector2(0, c->get_size().y));
Vector<Color> colors; Vector<Color> colors;
colors.push_back(Color(1, 1, 1)); colors.push_back(Color(1, 1, 1, 1));
colors.push_back(Color(1, 1, 1)); colors.push_back(Color(1, 1, 1, 1));
colors.push_back(Color()); colors.push_back(Color(0, 0, 0, 1));
colors.push_back(Color()); colors.push_back(Color(0, 0, 0, 1));
c->draw_polygon(points, colors); c->draw_polygon(points, colors);
Vector<Color> colors2; Vector<Color> colors2;
Color col = color; Color col = color;
@ -279,7 +281,7 @@ void ColorPicker::_hsv_draw(int p_wich, Control *c) {
colors2.push_back(col); colors2.push_back(col);
col.a = 0; col.a = 0;
colors2.push_back(col); colors2.push_back(col);
c->draw_polygon(points, colors); c->draw_polygon(points, colors2);
int x = CLAMP(c->get_size().x * s, 0, c->get_size().x); int x = CLAMP(c->get_size().x * s, 0, c->get_size().x);
int y = CLAMP(c->get_size().y - c->get_size().y * v, 0, c->get_size().y); int y = CLAMP(c->get_size().y - c->get_size().y * v, 0, c->get_size().y);
col = color; col = color;
@ -290,7 +292,7 @@ void ColorPicker::_hsv_draw(int p_wich, Control *c) {
} else if (p_wich == 1) { } else if (p_wich == 1) {
Ref<Texture> hue = get_icon("color_hue", "ColorPicker"); Ref<Texture> hue = get_icon("color_hue", "ColorPicker");
c->draw_texture_rect(hue, Rect2(Point2(), c->get_size())); c->draw_texture_rect(hue, Rect2(Point2(), c->get_size()));
int y = c->get_size().y - c->get_size().y * h; int y = c->get_size().y - c->get_size().y * (1.0 - h);
Color col = Color(); Color col = Color();
col.set_hsv(h, 1, 1); col.set_hsv(h, 1, 1);
c->draw_line(Point2(0, y), Point2(c->get_size().x, y), col.inverted()); c->draw_line(Point2(0, y), Point2(c->get_size().x, y), col.inverted());
@ -343,7 +345,7 @@ void ColorPicker::_w_input(const Ref<InputEvent> &ev) {
if (bev->is_pressed() && bev->get_button_index() == BUTTON_LEFT) { if (bev->is_pressed() && bev->get_button_index() == BUTTON_LEFT) {
changing_color = true; changing_color = true;
h = 1 - ((float)bev->get_position().y) / 256.0; h = 1 - (256.0 - (float)bev->get_position().y) / 256.0;
} else { } else {
changing_color = false; changing_color = false;
@ -362,7 +364,8 @@ void ColorPicker::_w_input(const Ref<InputEvent> &ev) {
if (!changing_color) if (!changing_color)
return; return;
float y = CLAMP((float)mev->get_position().y, 0, 256); float y = CLAMP((float)mev->get_position().y, 0, 256);
h = 1.0 - y / 256.0; //h = 1.0 - y / 256.0;
h = y / 256.0;
color.set_hsv(h, s, v, color.a); color.set_hsv(h, s, v, color.a);
last_hsv = color; last_hsv = color;
set_pick_color(color); set_pick_color(color);