copilot/infinipaint
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Added font size modifier to edit GUI

Browse source
This commit is contained in:
Yousef Khadadeh 2025-11-05 14:55:22 +03:00
parent 4857b40af3
commit bc8bd93e3b
8 changed files with 80 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/GUIStuff/Elements/NumberSlider.hpp
View file

@ -5,8 +5,9 @@ namespace GUIStuff {
template <typename T> class NumberSlider : public Element {
public:
void update(UpdateInputData& io, T* dataPtr, T minNew, T maxNew, const std::function<void()>& elemUpdate) {
data = dataPtr;
bool update(UpdateInputData& io, T* data, T minNew, T maxNew, const std::function<void()>& elemUpdate) {
bool isUpdating = false;
min = minNew;
max = maxNew;
@ -19,17 +20,22 @@ template <typename T> class NumberSlider : public Element {
selection.update(Clay_Hovered(), io.mouse.leftClick, io.mouse.leftHeld);
if(selection.held && data) {
float fracPosOnSlider = (io.mouse.pos.x() - bb.min.x()) / bb.width();
*data = std::clamp<T>(std::lerp<double>(min, max, fracPosOnSlider), min, max);
*data = static_cast<T>(std::clamp<double>(std::lerp<double>(min, max, fracPosOnSlider), min, max)); // Clamp as double then cast so that unsigned types dont wrap on clamp
isUpdating = true;
}
if(elemUpdate)
elemUpdate();
}
if(data)
cachedData = *data;
else
cachedData = 0.0;
return isUpdating;
}
virtual void clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command) override {
if(!data)
return;
bb = get_bb(command);
canvas->save();
@ -47,7 +53,7 @@ template <typename T> class NumberSlider : public Element {
const float yChange = bb.height() * 0.5f - holderRadius * 0.5f;
float holderPos = lerp_time<float>(*data, max, min) * bb.width();
float holderPos = lerp_time<float>(cachedData, max, min) * bb.width();
SkRect barFull = SkRect::MakeXYWH(0.0f, yChange, holderPos, holderRadius);
SkRect barEmpty = SkRect::MakeXYWH(holderPos, yChange, bb.width() - holderPos, holderRadius);
@ -80,9 +86,9 @@ template <typename T> class NumberSlider : public Element {
SCollision::AABB<float> bb;
SelectionHelper selection;
T* data = nullptr;
T min = 0.0;
T max = 1.0;
T cachedData = 0.0;
float hoverAnimation = 0.0;
float holdAnimation = 0.0;

24
src/GUIStuff/Elements/TextBox.hpp
View file

@ -8,7 +8,9 @@ namespace GUIStuff {
template <typename T> class TextBox : public Element {
public:
void update(UpdateInputData& io, T* newData, const std::function<std::optional<T>(const std::string&)>& newFromStr, const std::function<std::string(const T&)> newToStr, bool newSingleLine, bool updateEveryEdit, const std::function<void(SelectionHelper&)>& elemUpdate) {
bool update(UpdateInputData& io, T* newData, const std::function<std::optional<T>(const std::string&)>& newFromStr, const std::function<std::string(const T&)> newToStr, bool newSingleLine, bool updateEveryEdit, const std::function<void(SelectionHelper&)>& elemUpdate) {
bool isUpdating = false;
if(!textbox || !cur)
force_update_textbox(io, false);
@ -30,17 +32,23 @@ template <typename T> class TextBox : public Element {
if(data && selection.selected) {
io.richTextBoxEdit(textbox, cur);
textbox->process_mouse_left_button(*cur, io.mouse.pos - bb.min, io.mouse.leftClick, io.mouse.leftHeld, io.key.leftShift);
update_on_edit(updateEveryEdit);
if(updateEveryEdit || io.key.enter) {
update_on_edit();
isUpdating = true;
}
}
if(data && selection.justUnselected) {
std::optional<T> dataToAssign = fromStr(textbox->get_string());
if(dataToAssign)
*data = dataToAssign.value();
force_update_textbox(io, true);
isUpdating = true;
}
if(elemUpdate)
elemUpdate(selection);
}
return isUpdating;
}
virtual void clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command) override {
@ -98,13 +106,11 @@ template <typename T> class TextBox : public Element {
}
}
void update_on_edit(bool updateEveryEdit) {
if(updateEveryEdit) {
std::optional<T> dataToAssign = fromStr(textbox->get_string());
if(dataToAssign) {
*data = dataToAssign.value();
oldData = *data;
}
void update_on_edit() {
std::optional<T> dataToAssign = fromStr(textbox->get_string());
if(dataToAssign) {
*data = dataToAssign.value();
oldData = *data;
}
}