asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Stop ColorPicker's narcissism ( fixes #3592 )

Browse source 
Also prevent alpha in guidelines.
This commit is contained in:
MarianoGNU 2016-02-06 00:26:54 -03:00
parent 614cf481ce
commit 11b3b68c3f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene/gui/color_picker.cpp
View file

@ -270,8 +270,10 @@ void ColorPicker::_hsv_draw(int p_wich,Control* c)
if (p_wich==0) { if (p_wich==0) {
int x=c->get_size().x*s; int x=c->get_size().x*s;
int y=c->get_size().y-c->get_size().y*v; int y=c->get_size().y-c->get_size().y*v;
c->draw_line(Point2(x,0),Point2(x,c->get_size().y),color.inverted()); Color col = color;
c->draw_line(Point2(0,y),Point2(c->get_size().x,y),color.inverted()); col.a=1;
c->draw_line(Point2(x,0),Point2(x,c->get_size().y),col.inverted());
c->draw_line(Point2(0,y),Point2(c->get_size().x,y),col.inverted());
c->draw_line(Point2(x,y),Point2(x,y),Color(1,1,1),2); c->draw_line(Point2(x,y),Point2(x,y),Color(1,1,1),2);
} else if (p_wich==1) { } else if (p_wich==1) {
int y=c->get_size().y-c->get_size().y*h; int y=c->get_size().y-c->get_size().y*h;

2
scene/gui/color_picker.h
View file

@ -91,8 +91,6 @@ private:
void _add_preset_pressed(); void _add_preset_pressed();
void _screen_pick_pressed(); void _screen_pick_pressed();
friend class ColorPicker;
protected: protected:
void _notification(int); void _notification(int);