Working on getting GUI functional again
This commit is contained in:
parent
f3fde56dcf
commit
16c3097534
49 changed files with 178 additions and 104 deletions
|
|
@ -8,11 +8,11 @@ namespace GUIStuff {
|
|||
CheckBox::CheckBox(GUIManager& gui):
|
||||
Element(gui) {}
|
||||
|
||||
void CheckBox::layout(const std::function<bool()>& isTicked, const std::function<void()>& onClick) {
|
||||
void CheckBox::layout(const Clay_ElementId& id, const std::function<bool()>& isTicked, const std::function<void()>& onClick) {
|
||||
this->isTicked = isTicked;
|
||||
this->onClick = onClick;
|
||||
|
||||
CLAY_AUTO_ID({
|
||||
CLAY(id, {
|
||||
.layout = {
|
||||
.sizing = {.width = CLAY_SIZING_FIXED(15), .height = CLAY_SIZING_FIXED(15)}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ class CheckBox : public Element {
|
|||
virtual bool input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button, bool mouseHovering) override;
|
||||
virtual bool input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion, bool mouseHovering) override;
|
||||
|
||||
void layout(const std::function<bool()>& isTicked, const std::function<void()>& onClick);
|
||||
void layout(const Clay_ElementId& id, const std::function<bool()>& isTicked, const std::function<void()>& onClick);
|
||||
private:
|
||||
static constexpr float CHECKBOX_ANIMATION_TIME = 0.3;
|
||||
bool isHovering = false;
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ namespace ColorPickerShaders {
|
|||
template <typename T> class ColorPicker : public Element {
|
||||
public:
|
||||
ColorPicker(GUIManager& gui);
|
||||
void layout(T* data, bool selectAlpha, const std::function<void()>& onChange);
|
||||
void layout(const Clay_ElementId& id, T* data, bool selectAlpha, const std::function<void()>& onChange);
|
||||
virtual void clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA);
|
||||
bool input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button, bool mouseHovering) override;
|
||||
bool input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion, bool mouseHovering) override;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@ namespace GUIStuff {
|
|||
|
||||
template <typename T> ColorPicker<T>::ColorPicker(GUIManager& gui): Element(gui) {}
|
||||
|
||||
template <typename T> void ColorPicker<T>::layout(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;
|
||||
savedHsv = rgb_to_hsv<Vector3f, T>(*data);
|
||||
this->selectAlpha = selectAlpha;
|
||||
this->onChange = onChange;
|
||||
|
||||
CLAY_AUTO_ID({
|
||||
CLAY(id, {
|
||||
.layout = {
|
||||
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0) }
|
||||
},
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ struct ColorPickerButtonData {
|
|||
template <typename T> class ColorPickerButton : public Element {
|
||||
public:
|
||||
ColorPickerButton(GUIManager& gui);
|
||||
void layout(T* val, const ColorPickerButtonData& d);
|
||||
void layout(const Clay_ElementId& id, T* val, const ColorPickerButtonData& d);
|
||||
private:
|
||||
ColorPickerButtonData data;
|
||||
bool isOpen = false;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace GUIStuff {
|
|||
|
||||
template <typename T> ColorPickerButton<T>::ColorPickerButton(GUIManager& gui): Element(gui) {}
|
||||
|
||||
template <typename T> void ColorPickerButton<T>::layout(T* val, const ColorPickerButtonData& d) {
|
||||
template <typename T> void ColorPickerButton<T>::layout(const Clay_ElementId& id, T* val, const ColorPickerButtonData& d) {
|
||||
this->data = d;
|
||||
|
||||
GUIStuff::ElementHelpers::color_button(gui, "Color Picker Button", val, {
|
||||
|
|
|
|||
|
|
@ -6,8 +6,12 @@ sk_sp<SkRuntimeEffect> ColorRectangleDisplay::alphaBackgroundEffect;
|
|||
|
||||
ColorRectangleDisplay::ColorRectangleDisplay(GUIManager& gui): Element(gui) {}
|
||||
|
||||
void ColorRectangleDisplay::layout(const std::function<SkColor4f()>& colorFunc) {
|
||||
void ColorRectangleDisplay::layout(const Clay_ElementId& id, const std::function<SkColor4f()>& colorFunc) {
|
||||
this->colorFunc = colorFunc;
|
||||
CLAY(id, {
|
||||
.layout = {.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)}},
|
||||
.custom = {this}
|
||||
}) {}
|
||||
}
|
||||
|
||||
void ColorRectangleDisplay::clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA) {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace GUIStuff {
|
|||
class ColorRectangleDisplay : public Element {
|
||||
public:
|
||||
ColorRectangleDisplay(GUIManager& gui);
|
||||
void layout(const std::function<SkColor4f()>& colorFunc);
|
||||
void layout(const Clay_ElementId& id, const std::function<SkColor4f()>& colorFunc);
|
||||
virtual void clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA) override;
|
||||
private:
|
||||
static constexpr const char* alphaBackgroundSksl =
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ struct DropdownOptions {
|
|||
template <typename T> class DropDown : public Element {
|
||||
public:
|
||||
DropDown(GUIManager& gui): Element(gui) {}
|
||||
void layout(T* data, const std::vector<std::string>& selections, const DropdownOptions& options = {}) {
|
||||
void layout(const Clay_ElementId& id, T* data, const std::vector<std::string>& selections, const DropdownOptions& options = {}) {
|
||||
opts = options;
|
||||
ElementHelpers::left_to_right_layout(gui, CLAY_SIZING_FIXED(opts.width), CLAY_SIZING_FIT(0), [&] {
|
||||
gui.element<SelectableButton>("dropdown", SelectableButton::Data{
|
||||
|
|
@ -84,8 +84,8 @@ template <typename T> class DropDown : public Element {
|
|||
.clipHorizontal = true,
|
||||
.elementContent = [&](size_t i) {
|
||||
bool selectedEntry = static_cast<size_t>(*data) == i;
|
||||
gui.element<LayoutElement>("elem", [&] {
|
||||
CLAY_AUTO_ID({
|
||||
gui.element<LayoutElement>("elem", [&] (const Clay_ElementId& lId) {
|
||||
CLAY(lId, {
|
||||
.layout = {
|
||||
.sizing = {.width = CLAY_SIZING_FIXED(250), .height = CLAY_SIZING_FIXED(18)},
|
||||
.padding = CLAY_PADDING_ALL(0),
|
||||
|
|
|
|||
|
|
@ -13,12 +13,11 @@ namespace GUIStuff {
|
|||
|
||||
void Element::clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA) {}
|
||||
|
||||
void Element::update_bounding_box(Clay_RenderCommand* command) {
|
||||
boundingBox = get_bb_from_command(command);
|
||||
}
|
||||
|
||||
void Element::clear_bounding_box() {
|
||||
boundingBox = std::nullopt;
|
||||
void Element::set_bounding_box_from_elem_data(const Clay_ElementData& elemData) {
|
||||
if(elemData.found)
|
||||
boundingBox = {{elemData.boundingBox.x, elemData.boundingBox.y}, {elemData.boundingBox.x + elemData.boundingBox.width, elemData.boundingBox.y + elemData.boundingBox.height}};
|
||||
else
|
||||
boundingBox = std::nullopt;
|
||||
}
|
||||
|
||||
const std::optional<SCollision::AABB<float>>& Element::get_bb() const {
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@ namespace GUIStuff {
|
|||
virtual void clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA);
|
||||
virtual bool collides_with_point(const Vector2f& p) const;
|
||||
|
||||
void update_bounding_box(Clay_RenderCommand* command);
|
||||
void clear_bounding_box();
|
||||
void set_bounding_box_from_elem_data(const Clay_ElementData& elemData);
|
||||
const std::optional<SCollision::AABB<float>>& get_bb() const;
|
||||
virtual ~Element() = default;
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ namespace GUIStuff {
|
|||
|
||||
FontPicker::FontPicker(GUIManager& gui): Element(gui) {}
|
||||
|
||||
void FontPicker::layout(const Data& data) {
|
||||
void FontPicker::layout(const Clay_ElementId& id, const Data& data) {
|
||||
d = data;
|
||||
//auto& io = *gui.io;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ class FontPicker : public Element {
|
|||
std::function<void()> onFontChange;
|
||||
};
|
||||
FontPicker(GUIManager& gui);
|
||||
void layout(const Data& data);
|
||||
void layout(const Clay_ElementId& id, const Data& data);
|
||||
private:
|
||||
Data d;
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
#include <nlohmann/json.hpp>
|
||||
#include "../../RichText/TextBox.hpp"
|
||||
#include "../../InputManager.hpp"
|
||||
#include "../GUIManagerID.hpp"
|
||||
|
||||
using namespace Eigen;
|
||||
|
||||
|
|
@ -37,6 +38,18 @@ template <size_t S> class StringArena {
|
|||
Clay_String std_str_to_clay_str(std::string_view str) {
|
||||
return Clay_String{.length = static_cast<int32_t>(str.size()), .chars = insert_string_into_arena(str)};
|
||||
}
|
||||
Clay_ElementId elem_id_from_id_stack(const GUIManagerIDStack& idStack) {
|
||||
std::string strToAdd;
|
||||
for(const GUIManagerID& id : idStack) {
|
||||
if(id.idIsStr)
|
||||
strToAdd += reinterpret_cast<const char*>(id.idNum);
|
||||
else
|
||||
strToAdd += std::to_string(id.idNum);
|
||||
strToAdd += '~';
|
||||
}
|
||||
Clay_String strForId = std_str_to_clay_str(strToAdd);
|
||||
return CLAY_SID(strForId);
|
||||
}
|
||||
private:
|
||||
std::array<char, S> stringArena;
|
||||
size_t stringArenaIndex;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
#include "LayoutElement.hpp"
|
||||
#include "Helpers/ConvertVec.hpp"
|
||||
|
||||
namespace GUIStuff {
|
||||
|
||||
LayoutElement::LayoutElement(GUIManager& gui): Element(gui) {}
|
||||
|
||||
void LayoutElement::layout(const std::function<void()>& layout, const Callbacks& c) {
|
||||
void LayoutElement::layout(const Clay_ElementId& id, const std::function<void(const Clay_ElementId&)>& layout, const Callbacks& c) {
|
||||
this->c = c;
|
||||
layout();
|
||||
layout(id);
|
||||
}
|
||||
|
||||
bool LayoutElement::input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button, bool mouseHovering) {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ class LayoutElement : public Element {
|
|||
std::function<bool(const InputManager::MouseWheelCallbackArgs& wheel, bool mouseHovering)> mouseWheel;
|
||||
std::function<void(const InputManager::KeyCallbackArgs& key)> key;
|
||||
};
|
||||
void layout(const std::function<void()>& layout, const Callbacks& c = {});
|
||||
void layout(const Clay_ElementId& id, const std::function<void(const Clay_ElementId&)>& layout, const Callbacks& c = {});
|
||||
virtual bool input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button, bool mouseHovering) override;
|
||||
virtual bool input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion, bool mouseHovering) override;
|
||||
virtual bool input_mouse_wheel_callback(const InputManager::MouseWheelCallbackArgs& wheel, bool mouseHovering) override;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace GUIStuff {
|
|||
|
||||
MovableTabList::MovableTabList(GUIManager& gui): Element(gui) {}
|
||||
|
||||
void MovableTabList::layout(const Data& d) {
|
||||
void MovableTabList::layout(const Clay_ElementId& id, const Data& d) {
|
||||
//CLAY_AUTO_ID({.layout = {
|
||||
// .sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIXED(GUIStuff::GUIManager::BIG_BUTTON_SIZE)},
|
||||
// .padding = CLAY_PADDING_ALL(0),
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ class MovableTabList : public Element {
|
|||
};
|
||||
|
||||
MovableTabList(GUIManager& gui);
|
||||
void layout(const Data& d);
|
||||
void layout(const Clay_ElementId& id, const Data& d);
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ template <typename T> class NumberSlider : public Element {
|
|||
NumberSlider(GUIManager& gui):
|
||||
Element(gui) {}
|
||||
|
||||
void layout(T* data, T minData, T maxData, const std::function<void()>& onChange) {
|
||||
void layout(const Clay_ElementId& id, T* data, T minData, T maxData, const std::function<void()>& onChange) {
|
||||
this->data = data;
|
||||
this->minData = minData;
|
||||
this->maxData = maxData;
|
||||
this->onChange = onChange;
|
||||
|
||||
CLAY_AUTO_ID({
|
||||
CLAY(id, {
|
||||
.layout = {
|
||||
.sizing = {.width = CLAY_SIZING_GROW(100), .height = CLAY_SIZING_FIXED(10)}
|
||||
},
|
||||
|
|
@ -76,23 +76,21 @@ template <typename T> class NumberSlider : public Element {
|
|||
virtual bool input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button, bool mouseHovering) override {
|
||||
isHovering = mouseHovering;
|
||||
isHeld = isHovering && button.button == InputManager::MouseButton::LEFT && button.down;
|
||||
update_slider_pos(button.pos);
|
||||
if(isHeld && boundingBox.has_value())
|
||||
update_slider_pos(button.pos);
|
||||
return Element::input_mouse_button_callback(button, mouseHovering);
|
||||
}
|
||||
|
||||
virtual bool input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion, bool mouseHovering) override {
|
||||
update_slider_pos(motion.pos);
|
||||
return Element::input_mouse_motion_callback(motion, mouseHovering);
|
||||
}
|
||||
|
||||
private:
|
||||
void update_slider_pos(const Vector2f& p) {
|
||||
gui.set_post_callback_func([&, p] {
|
||||
if(isHeld && boundingBox.has_value()) {
|
||||
float fracPosOnSlider = (p.x() - boundingBox.value().min.x()) / boundingBox.value().width();
|
||||
*data = static_cast<T>(std::clamp<double>(std::lerp<double>(minData, maxData, fracPosOnSlider), minData, maxData)); // Clamp as double then cast so that unsigned types dont wrap on clamp
|
||||
onChange();
|
||||
}
|
||||
float fracPosOnSlider = (p.x() - boundingBox.value().min.x()) / boundingBox.value().width();
|
||||
*data = static_cast<T>(std::clamp<double>(std::lerp<double>(minData, maxData, fracPosOnSlider), minData, maxData)); // Clamp as double then cast so that unsigned types dont wrap on clamp
|
||||
if(onChange) onChange();
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@ constexpr double ROTATE_BAR_SNAP_DISTRIBUTION = std::numbers::pi * 0.25;
|
|||
PaintCircleMenu::PaintCircleMenu(GUIManager& gui):
|
||||
Element(gui) {}
|
||||
|
||||
void PaintCircleMenu::layout(const Data& data) {
|
||||
void PaintCircleMenu::layout(const Clay_ElementId& id, const Data& data) {
|
||||
d = data;
|
||||
|
||||
CLAY_AUTO_ID({
|
||||
CLAY(id, {
|
||||
.layout = {
|
||||
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ class PaintCircleMenu : public Element {
|
|||
std::function<void()> onRotate;
|
||||
std::function<void()> onPaletteClick;
|
||||
};
|
||||
void layout(const Data& data);
|
||||
void layout(const Clay_ElementId& id, const Data& data);
|
||||
virtual bool collides_with_point(const Vector2f& p) const override;
|
||||
virtual void clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA) override;
|
||||
virtual bool input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button, bool mouseHovering) override;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
#include "PositionAdjustingPopupMenu.hpp"
|
||||
#include "../GUIManager.hpp"
|
||||
#include "Helpers/ConvertVec.hpp"
|
||||
|
||||
namespace GUIStuff {
|
||||
|
||||
PositionAdjustingPopupMenu::PositionAdjustingPopupMenu(GUIManager& gui): Element(gui) {}
|
||||
|
||||
void PositionAdjustingPopupMenu::layout(Vector2f popupPos, const std::function<void()>& innerContent) {
|
||||
void PositionAdjustingPopupMenu::layout(const Clay_ElementId& id, Vector2f popupPos, const std::function<void()>& innerContent) {
|
||||
if(layoutElement && layoutElement->get_bb().has_value()) {
|
||||
auto& bb = layoutElement->get_bb().value();
|
||||
if((popupPos.y() + bb.height()) > gui.io.windowSize.y())
|
||||
|
|
@ -14,8 +15,8 @@ void PositionAdjustingPopupMenu::layout(Vector2f popupPos, const std::function<v
|
|||
popupPos.x() -= bb.width();
|
||||
}
|
||||
|
||||
layoutElement = gui.element<LayoutElement>("popup", [&]{
|
||||
CLAY_AUTO_ID({
|
||||
layoutElement = gui.element<LayoutElement>("popup", [&] (const Clay_ElementId& lId) {
|
||||
CLAY(lId, {
|
||||
.layout = {
|
||||
.sizing = {.width = CLAY_SIZING_FIT(100), .height = CLAY_SIZING_FIT(0)},
|
||||
.padding = CLAY_PADDING_ALL(gui.io.theme->padding1),
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace GUIStuff {
|
|||
class PositionAdjustingPopupMenu : public Element {
|
||||
public:
|
||||
PositionAdjustingPopupMenu(GUIManager& gui);
|
||||
void layout(Vector2f popupPos, const std::function<void()>& innerContent);
|
||||
void layout(const Clay_ElementId& id, Vector2f popupPos, const std::function<void()>& innerContent);
|
||||
private:
|
||||
LayoutElement* layoutElement = nullptr;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ namespace GUIStuff {
|
|||
RadioButton::RadioButton(GUIManager& gui):
|
||||
Element(gui) {}
|
||||
|
||||
void RadioButton::layout(const std::function<bool()>& isTicked, const std::function<void()>& onClick) {
|
||||
void RadioButton::layout(const Clay_ElementId& id, const std::function<bool()>& isTicked, const std::function<void()>& onClick) {
|
||||
this->onClick = onClick;
|
||||
this->isTicked = isTicked;
|
||||
|
||||
CLAY_AUTO_ID({
|
||||
CLAY(id, {
|
||||
.layout = {
|
||||
.sizing = {.width = CLAY_SIZING_FIXED(20), .height = CLAY_SIZING_FIXED(20)}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ class RadioButton : public Element {
|
|||
virtual bool input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button, bool mouseHovering) override;
|
||||
virtual bool input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion, bool mouseHovering) override;
|
||||
|
||||
void layout(const std::function<bool()>& isTicked, const std::function<void()>& onClick);
|
||||
void layout(const Clay_ElementId& id, const std::function<bool()>& isTicked, const std::function<void()>& onClick);
|
||||
private:
|
||||
static constexpr float RADIOBUTTON_ANIMATION_TIME = 0.3;
|
||||
bool isHovering = false;
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@ constexpr double ROTATE_BAR_SNAP_DISTRIBUTION = std::numbers::pi * 0.25;
|
|||
RotateWheel::RotateWheel(GUIManager& gui):
|
||||
Element(gui) {}
|
||||
|
||||
void RotateWheel::layout(double* rotateAngle, const std::function<void()>& onChange) {
|
||||
void RotateWheel::layout(const Clay_ElementId& id, double* rotateAngle, const std::function<void()>& onChange) {
|
||||
this->rotateAngle = rotateAngle;
|
||||
this->onChange = onChange;
|
||||
|
||||
CLAY_AUTO_ID({
|
||||
CLAY(id, {
|
||||
.layout = {
|
||||
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ namespace GUIStuff {
|
|||
class RotateWheel : public Element {
|
||||
public:
|
||||
RotateWheel(GUIManager& gui);
|
||||
void layout(double* rotateAngle, const std::function<void()>& onChange);
|
||||
void layout(const Clay_ElementId& id, double* rotateAngle, const std::function<void()>& onChange);
|
||||
virtual void clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA) override;
|
||||
virtual bool input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button, bool mouseHovering) override;
|
||||
virtual bool input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion, bool mouseHovering) override;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ namespace GUIStuff {
|
|||
SVGIcon::SVGIcon(GUIManager& gui):
|
||||
Element(gui) {}
|
||||
|
||||
void SVGIcon::layout(const std::string& newSvgPath, bool newIsHighlighted) {
|
||||
void SVGIcon::layout(const Clay_ElementId& id, const std::string& newSvgPath, bool newIsHighlighted) {
|
||||
auto& io = gui.io;
|
||||
auto findSVGData = io.svgData.find(newSvgPath);
|
||||
if(findSVGData == io.svgData.end())
|
||||
|
|
@ -20,7 +20,7 @@ void SVGIcon::layout(const std::string& newSvgPath, bool newIsHighlighted) {
|
|||
|
||||
highlighted = newIsHighlighted;
|
||||
|
||||
CLAY_AUTO_ID({
|
||||
CLAY(id, {
|
||||
.layout = {
|
||||
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0) }
|
||||
},
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ namespace GUIStuff {
|
|||
class SVGIcon : public Element {
|
||||
public:
|
||||
SVGIcon(GUIManager& gui);
|
||||
void layout(const std::string& newSvgPath, bool newIsHighlighted);
|
||||
void layout(const Clay_ElementId& id, const std::string& newSvgPath, bool newIsHighlighted);
|
||||
virtual void clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA) override;
|
||||
private:
|
||||
bool highlighted;
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ namespace GUIStuff {
|
|||
|
||||
ScrollArea::ScrollArea(GUIManager& gui): Element(gui) {}
|
||||
|
||||
void ScrollArea::layout(const Options& options) {
|
||||
void ScrollArea::layout(const Clay_ElementId& id, const Options& options) {
|
||||
opts = options;
|
||||
CLAY_AUTO_ID({
|
||||
CLAY(id, {
|
||||
.layout = {.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)}}
|
||||
}) {
|
||||
Clay_ElementId localID = CLAY_ID_LOCAL("SCROLL_AREA");
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ class ScrollArea : public Element {
|
|||
std::function<void(const InnerContentParameters&)> innerContent;
|
||||
};
|
||||
|
||||
void layout(const Options& options);
|
||||
void layout(const Clay_ElementId& id, const Options& options);
|
||||
|
||||
virtual bool input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button, bool mouseHovering) override;
|
||||
virtual bool input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion, bool mouseHovering) override;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace GUIStuff {
|
|||
SelectableButton::SelectableButton(GUIManager& gui):
|
||||
Element(gui) {}
|
||||
|
||||
void SelectableButton::layout(const Data& d) {
|
||||
void SelectableButton::layout(const Clay_ElementId& id, const Data& d) {
|
||||
auto& io = gui.io;
|
||||
|
||||
SkColor4f borderColor;
|
||||
|
|
@ -37,7 +37,7 @@ void SelectableButton::layout(const Data& d) {
|
|||
else
|
||||
backgroundColor = io.theme->fillColor2;
|
||||
|
||||
CLAY_AUTO_ID({.layout = {
|
||||
CLAY(id, {.layout = {
|
||||
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)},
|
||||
.childGap = 0,
|
||||
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_CENTER }
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ class SelectableButton : public Element {
|
|||
};
|
||||
|
||||
SelectableButton(GUIManager& gui);
|
||||
void layout(const Data& d);
|
||||
void layout(const Clay_ElementId& id, const Data& d);
|
||||
virtual bool input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button, bool mouseHovering) override;
|
||||
virtual bool input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion, bool mouseHovering) override;
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ template <typename T> class TextBox : public Element {
|
|||
public:
|
||||
TextBox(GUIManager& gui);
|
||||
|
||||
void layout(const TextBoxData<T>& userInfo);
|
||||
void layout(const Clay_ElementId& id, const TextBoxData<T>& userInfo);
|
||||
virtual void clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA) override;
|
||||
virtual bool input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button, bool mouseHovering) override;
|
||||
virtual bool input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion, bool mouseHovering) override;
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ namespace GUIStuff {
|
|||
|
||||
template <typename T> TextBox<T>::TextBox(GUIManager& gui): Element(gui) {}
|
||||
|
||||
template <typename T> void TextBox<T>::layout(const TextBoxData<T>& userInfo) {
|
||||
template <typename T> void TextBox<T>::layout(const Clay_ElementId& id, const TextBoxData<T>& userInfo) {
|
||||
auto& io = gui.io;
|
||||
this->userInfo = userInfo;
|
||||
init_textbox(io);
|
||||
CLAY_AUTO_ID({
|
||||
CLAY(id, {
|
||||
.layout = {
|
||||
.sizing = {.width = CLAY_SIZING_GROW(static_cast<float>(io.fontSize * 2)), .height = CLAY_SIZING_FIXED(static_cast<float>(io.fontSize * 1.25f))}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@ namespace GUIStuff {
|
|||
TextParagraph::TextParagraph(GUIManager& gui):
|
||||
Element(gui) {}
|
||||
|
||||
void TextParagraph::layout(std::unique_ptr<skia::textlayout::Paragraph> paragraph, float width) {
|
||||
void TextParagraph::layout(const Clay_ElementId& id, std::unique_ptr<skia::textlayout::Paragraph> paragraph, float width) {
|
||||
data = std::move(paragraph);
|
||||
data->layout(width);
|
||||
CLAY_AUTO_ID({
|
||||
CLAY(id, {
|
||||
.layout = {
|
||||
.sizing = {.width = CLAY_SIZING_FIXED(width), .height = CLAY_SIZING_FIXED(data->getHeight())}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace GUIStuff {
|
|||
class TextParagraph : public Element {
|
||||
public:
|
||||
TextParagraph(GUIManager& gui);
|
||||
void layout(std::unique_ptr<skia::textlayout::Paragraph> paragraph, float width);
|
||||
void layout(const Clay_ElementId& id, std::unique_ptr<skia::textlayout::Paragraph> paragraph, float width);
|
||||
virtual void clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA) override;
|
||||
private:
|
||||
std::unique_ptr<skia::textlayout::Paragraph> data;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ namespace GUIStuff {
|
|||
TreeListing::TreeListing(GUIManager& gui):
|
||||
Element(gui) {}
|
||||
|
||||
void TreeListing::layout(NetworkingObjects::NetObjID rootObjID, const DisplayData& displayData, SelectionData& selectionData) {
|
||||
void TreeListing::layout(const Clay_ElementId& id, NetworkingObjects::NetObjID rootObjID, const DisplayData& displayData, SelectionData& selectionData) {
|
||||
//auto& io = *gui.io;
|
||||
|
||||
//if(!io.mouse.leftHeld)
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ class TreeListing : public Element {
|
|||
};
|
||||
|
||||
TreeListing(GUIManager& gui);
|
||||
void layout(NetworkingObjects::NetObjID rootObjID, const DisplayData& displayData, SelectionData& selectionData);
|
||||
void layout(const Clay_ElementId& id, NetworkingObjects::NetObjID rootObjID, const DisplayData& displayData, SelectionData& selectionData);
|
||||
virtual bool input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button, bool mouseHovering) override;
|
||||
virtual bool input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion, bool mouseHovering) override;
|
||||
virtual void input_key_callback(const InputManager::KeyCallbackArgs& key) override;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue