Fixed color picker
This commit is contained in:
parent
fcdf1944f7
commit
f944cb8a68
3 changed files with 20 additions and 6 deletions
|
|
@ -78,6 +78,7 @@ template <typename T> class ColorPicker : public Element {
|
||||||
static constexpr float BAR_GAP = 5.0;
|
static constexpr float BAR_GAP = 5.0;
|
||||||
|
|
||||||
T* data;
|
T* data;
|
||||||
|
std::optional<T> oldData;
|
||||||
Vector3f savedHsv; // We save the HSV so that conversion doesnt ruin the UI
|
Vector3f savedHsv; // We save the HSV so that conversion doesnt ruin the UI
|
||||||
std::function<void()> onChange;
|
std::function<void()> onChange;
|
||||||
bool selectAlpha = false;
|
bool selectAlpha = false;
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,10 @@ template <typename T> ColorPicker<T>::ColorPicker(GUIManager& gui): Element(gui)
|
||||||
|
|
||||||
template <typename T> void ColorPicker<T>::layout(const Clay_ElementId& id, T* data, bool selectAlpha, const std::function<void()>& onChange) {
|
template <typename T> void ColorPicker<T>::layout(const Clay_ElementId& id, T* data, bool selectAlpha, const std::function<void()>& onChange) {
|
||||||
this->data = data;
|
this->data = data;
|
||||||
savedHsv = rgb_to_hsv<Vector3f, T>(*data);
|
if(!oldData.has_value() || oldData.value() != *data) {
|
||||||
|
savedHsv = rgb_to_hsv<Vector3f, T>(*data);
|
||||||
|
oldData = *data;
|
||||||
|
}
|
||||||
this->selectAlpha = selectAlpha;
|
this->selectAlpha = selectAlpha;
|
||||||
this->onChange = onChange;
|
this->onChange = onChange;
|
||||||
|
|
||||||
|
|
@ -121,7 +124,7 @@ template <typename T> void ColorPicker<T>::update_color_picker_pos(const Vector2
|
||||||
savedHsv.y() = newSv.x();
|
savedHsv.y() = newSv.x();
|
||||||
savedHsv.z() = 1.0f - newSv.y();
|
savedHsv.z() = 1.0f - newSv.y();
|
||||||
set_hsv(savedHsv);
|
set_hsv(savedHsv);
|
||||||
gui.set_post_callback_func([&]{if(onChange) onChange();});
|
if(onChange) onChange();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case HeldBar::HUE_HELD: {
|
case HeldBar::HUE_HELD: {
|
||||||
|
|
@ -129,14 +132,15 @@ template <typename T> void ColorPicker<T>::update_color_picker_pos(const Vector2
|
||||||
Vector2f hueDim = get_hue_bar_dim();
|
Vector2f hueDim = get_hue_bar_dim();
|
||||||
savedHsv.x() = (1.0f - std::clamp((p.y() - huePos.y()) / hueDim.y(), 0.0f, 1.0f)) * 360.0f;
|
savedHsv.x() = (1.0f - std::clamp((p.y() - huePos.y()) / hueDim.y(), 0.0f, 1.0f)) * 360.0f;
|
||||||
set_hsv(savedHsv);
|
set_hsv(savedHsv);
|
||||||
gui.set_post_callback_func([&]{if(onChange) onChange();});
|
if(onChange) onChange();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case HeldBar::ALPHA_HELD: {
|
case HeldBar::ALPHA_HELD: {
|
||||||
Vector2f alphaPos = get_alpha_bar_pos();
|
Vector2f alphaPos = get_alpha_bar_pos();
|
||||||
Vector2f alphaDim = get_alpha_bar_dim();
|
Vector2f alphaDim = get_alpha_bar_dim();
|
||||||
(*data)[3] = std::clamp((p.x() - alphaPos.x()) / alphaDim.x(), 0.0f, 1.0f);
|
(*data)[3] = std::clamp((p.x() - alphaPos.x()) / alphaDim.x(), 0.0f, 1.0f);
|
||||||
gui.set_post_callback_func([&]{if(onChange) onChange();});
|
oldData = *data;
|
||||||
|
if(onChange) onChange();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -169,6 +173,7 @@ template <typename T> void ColorPicker<T>::set_hsv(const Vector3f& hsv) {
|
||||||
(*data)[0] = a.x();
|
(*data)[0] = a.x();
|
||||||
(*data)[1] = a.y();
|
(*data)[1] = a.y();
|
||||||
(*data)[2] = a.z();
|
(*data)[2] = a.z();
|
||||||
|
oldData = *data;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -120,12 +120,16 @@ void ScrollArea::layout(const Clay_ElementId& id, const Options& options) {
|
||||||
gui.set_to_layout();
|
gui.set_to_layout();
|
||||||
}
|
}
|
||||||
if(isScrollbarHeldY) {
|
if(isScrollbarHeldY) {
|
||||||
|
float oldScrollOffset = scrollOffset.y();
|
||||||
|
|
||||||
float newScrollPosFrac;
|
float newScrollPosFrac;
|
||||||
newScrollPosFrac = std::clamp((scrollerStartPosY - (mouseStartPosY - motion.pos.y()) - sAreaStart - scrollerSize * 0.5f) / (sAreaDim - scrollerSize), 0.0f, 1.0f);
|
newScrollPosFrac = std::clamp((scrollerStartPosY - (mouseStartPosY - motion.pos.y()) - sAreaStart - scrollerSize * 0.5f) / (sAreaDim - scrollerSize), 0.0f, 1.0f);
|
||||||
scrollOffset.y() = newScrollPosFrac * (-scrollPosMax);
|
scrollOffset.y() = newScrollPosFrac * (-scrollPosMax);
|
||||||
|
|
||||||
clamp_scroll();
|
clamp_scroll();
|
||||||
gui.set_to_layout();
|
|
||||||
|
if(oldScrollOffset != scrollOffset.y())
|
||||||
|
gui.set_to_layout();
|
||||||
}
|
}
|
||||||
return mouseHovering;
|
return mouseHovering;
|
||||||
}
|
}
|
||||||
|
|
@ -149,12 +153,16 @@ void ScrollArea::clamp_scroll() {
|
||||||
|
|
||||||
bool ScrollArea::input_mouse_wheel_callback(const InputManager::MouseWheelCallbackArgs& wheel, bool mouseHovering) {
|
bool ScrollArea::input_mouse_wheel_callback(const InputManager::MouseWheelCallbackArgs& wheel, bool mouseHovering) {
|
||||||
if(mouseHovering) {
|
if(mouseHovering) {
|
||||||
|
Vector2f oldScrollOffset = scrollOffset;
|
||||||
|
|
||||||
if(opts.scrollVertical)
|
if(opts.scrollVertical)
|
||||||
scrollOffset.y() = scrollOffset.y() + wheel.amount.y() * 10.0f;
|
scrollOffset.y() = scrollOffset.y() + wheel.amount.y() * 10.0f;
|
||||||
if(opts.scrollHorizontal)
|
if(opts.scrollHorizontal)
|
||||||
scrollOffset.y() = scrollOffset.x() + wheel.amount.x() * 10.0f;
|
scrollOffset.y() = scrollOffset.x() + wheel.amount.x() * 10.0f;
|
||||||
clamp_scroll();
|
clamp_scroll();
|
||||||
gui.set_to_layout();
|
|
||||||
|
if(oldScrollOffset != scrollOffset)
|
||||||
|
gui.set_to_layout();
|
||||||
}
|
}
|
||||||
return Element::input_mouse_wheel_callback(wheel, mouseHovering);
|
return Element::input_mouse_wheel_callback(wheel, mouseHovering);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue