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

Fix color selected with mouse scroll

Browse Source 
Fix #7192

(cherry picked from commit d9048309e4)
This commit is contained in:
volzhs
2016-11-27 23:11:42 +09:00
committed by Rémi Verschelde
parent 6227e8f343
commit f95694ee86
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scene/gui/color_picker.cpp
View File

@@ -296,7 +296,7 @@ void ColorPicker::_hsv_draw(int p_wich,Control* c)
void ColorPicker::_uv_input(const InputEvent &ev) { void ColorPicker::_uv_input(const InputEvent &ev) {
if (ev.type == InputEvent::MOUSE_BUTTON) { if (ev.type == InputEvent::MOUSE_BUTTON) {
const InputEventMouseButton &bev = ev.mouse_button; const InputEventMouseButton &bev = ev.mouse_button;
if (bev.pressed) { if (bev.pressed && bev.button_index==BUTTON_LEFT) {
changing_color = true; changing_color = true;
float x = CLAMP((float)bev.x,0,256); float x = CLAMP((float)bev.x,0,256);
float y = CLAMP((float)bev.y,0,256); float y = CLAMP((float)bev.y,0,256);
@@ -329,7 +329,7 @@ void ColorPicker::_uv_input(const InputEvent &ev) {
void ColorPicker::_w_input(const InputEvent &ev) { void ColorPicker::_w_input(const InputEvent &ev) {
if (ev.type == InputEvent::MOUSE_BUTTON) { if (ev.type == InputEvent::MOUSE_BUTTON) {
const InputEventMouseButton &bev = ev.mouse_button; const InputEventMouseButton &bev = ev.mouse_button;
if (bev.pressed) { if (bev.pressed && bev.button_index==BUTTON_LEFT) {
changing_color = true; changing_color = true;
h=1-((float)bev.y)/256.0; h=1-((float)bev.y)/256.0;