ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor idea done unstable

Browse source
This commit is contained in:
IlyaShurupov 2024-10-11 17:30:38 +03:00 • committed by Ilya Shurupov
parent 0ebbe75b6e
commit d6025bc4e0
4 changed files with 160 additions and 382 deletions
Download patch file Download diff file Expand all files Collapse all files

43
WidgetsNew/public/LayoutPolicies.hpp
View file

@ -1,6 +1,7 @@
#pragma once
#include "Rect.hpp"
#include <vector>
namespace tp {
class Widget;
@ -20,26 +21,17 @@ namespace tp {
class WidgetLayout {
public:
explicit WidgetLayout(Widget* widget) { mWidget = widget; }
virtual ~WidgetLayout() = default;
virtual void adjustWidget() = 0;
virtual void pickRect();
virtual void clampRect();
virtual void adjustChildrenRect();
void adjustLayout(bool vertical);
halnf changeChildSize(Widget*, halnf diff, bool vertical);
RangeF pickRange(const RangeF& current, const RangeF& children, const RangeF& parent, bool vertical);
RangeF clampRange(const RangeF& current, const RangeF& children, const RangeF& parent, bool vertical);
void clampMinMaxSize();
RectF getChildrenEnclosure();
RectF getParentEnclosure();
virtual void pickRect() = 0;
virtual void clampRect() = 0;
virtual void adjustChildrenRect() = 0;
protected:
const RectF& getArea();
[[nodiscard]] const RectF& getArea() const;
void setArea(const RectF& area);
[[nodiscard]] Widget* parent() const;
[[nodiscard]] const std::vector<Widget*>& children() const;
private:
Widget* mWidget = nullptr;
@ -47,12 +39,27 @@ namespace tp {
class BasicLayout : public WidgetLayout {
public:
BasicLayout() = default;
explicit BasicLayout(Widget* widget) : WidgetLayout(widget) {}
void adjustWidget() override;
void pickRect() override;
void clampRect() override;
void adjustChildrenRect() override;
public:
const Vec2F& getMinSize();
void setMinSize(const Vec2F& size);
private:
void adjustLayout(bool vertical);
static halnf changeChildSize(Widget*, halnf diff, bool vertical);
[[nodiscard]] RangeF pickRange(const RangeF& current, const RangeF& child, const RangeF& parent, bool v) const;
[[nodiscard]] RangeF clampRange(const RangeF& current, const RangeF& child, const RangeF& parent, bool v) const;
void clampMinMaxSize();
[[nodiscard]] RectF getChildrenEnclosure() const;
[[nodiscard]] RectF getParentEnclosure() const;
private:
LayoutPolicy mLayoutPolicy = LayoutPolicy::Vertical;

83
WidgetsNew/public/Widget.hpp
View file

@ -10,66 +10,42 @@
namespace tp {
class WidgetManagerInterface;
class WidgetLayout;
class Widget {
friend class RootWidget;
public:
Widget();
virtual ~Widget() = default;
void setDebug(const char* name, RGBA col) {
mName = name;
mDebugColor = col;
}
virtual ~Widget();
void addChild(Widget* child);
void removeChild(Widget* child);
WidgetManagerInterface* getRoot();
void triggerWidgetUpdate(const char* reason = nullptr);
void bringToFront();
void bringToBack();
void setSizePolicy(SizePolicy x, SizePolicy y);
void setLayoutPolicy(LayoutPolicy layoutPolicy);
void setLayout(WidgetLayout* layout);
WidgetLayout* getLayout();
const Vec2F& getMinSize();
void setMinSize(const Vec2F& size);
public:
protected:
virtual void process(const EventHandler& events) {}
virtual void draw(Canvas& canvas) {}
virtual void drawOverlay(Canvas& canvas) {}
virtual void endAnimations();
virtual void updateAnimations();
[[nodiscard]] virtual bool processesEvents() const;
[[nodiscard]] virtual bool propagateEventsToChildren() const;
[[nodiscard]] virtual bool needsNextFrame() const;
virtual void mouseEnter();
virtual void mouseLeave();
// size policies
virtual void pickRect();
virtual void clampRect();
virtual void adjustChildrenRect();
// resizing
RangeF pickRange(const RangeF& current, const RangeF& children, const RangeF& parent, bool vertical);
RangeF clampRange(const RangeF& current, const RangeF& children, const RangeF& parent, bool vertical);
void clampMinMaxSize();
RectF getChildrenEnclosure() const;
RectF getParentEnclosure();
void adjustLayout(bool vertical);
halnf changeChildSize(Widget*, halnf diff, bool vertical);
[[nodiscard]] virtual bool processesEvents() const;
[[nodiscard]] virtual bool propagateEventsToChildren() const;
[[nodiscard]] virtual bool needsNextFrame() const;
virtual void endAnimations();
virtual void updateAnimations();
protected:
void setDebug(const char* name, RGBA col);
WidgetManagerInterface* getRoot();
void triggerWidgetUpdate(const char* reason = nullptr);
public:
[[nodiscard]] RectF getArea() const;
@ -84,7 +60,7 @@ namespace tp {
void setAreaCache(const RectF& area);
protected:
friend class WidgetLayout;
friend WidgetLayout;
Widget* mParent = nullptr;
@ -93,30 +69,23 @@ namespace tp {
// relative to the parent
SpringRect mArea;
RectF mAreaCache;
// resizing
LayoutPolicy mLayoutPolicy = LayoutPolicy::Passive;
Vec2<SizePolicy> mSizePolicy = { SizePolicy::Fixed, SizePolicy::Fixed };
Vec2F mMinSize = { 50, 50 };
Vec2F mMaxSize = { FLT_MAX / 2, FLT_MAX / 2 };
WidgetLayout* mLayout = nullptr;
bool mInFocus = false;
halnf mLayoutGap = 5;
halnf mLayoutMargin = 10;
// cache
RectF mAreaCache;
// debug
std::string mName = "widget base";
Vec2F mLocalPoint;
Vec2F mGlobalPoint;
RGBA mDebugColor = { 1, 1, 1, 0.3 };
std::string mTriggerReason = "none";
struct {
std::string id = "widget base";
RGBA col = { 1, 1, 1, 0.3 };
std::string triggerReason = "none";
Vec2F pLocal;
Vec2F pGlobal;
} mDebug;
};
struct WidgetManagerInterface : public Widget {
virtual void updateWidget(Widget*, const char* reason = nullptr) = 0;
virtual void updateWidget(Widget*, const char* reason) = 0;
};
}