diff --git a/doc/sceneClasses.graphml b/doc/sceneClasses.graphml index a199776..27c7361 100644 --- a/doc/sceneClasses.graphml +++ b/doc/sceneClasses.graphml @@ -253,13 +253,12 @@ - - + - ScrollableContent + ScrollableContentNode @@ -454,6 +453,23 @@ + + + + + + + TextContainerNode + + + + + + + + + + @@ -713,31 +729,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -767,6 +758,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/scene/gui/callback.h b/src/scene/gui/callback.h index c02636f..e272bd6 100644 --- a/src/scene/gui/callback.h +++ b/src/scene/gui/callback.h @@ -4,7 +4,6 @@ class CallBack { public: - CallBack(){} virtual void exec()=0; }; diff --git a/src/scene/gui/scrollablecontentnode.cpp b/src/scene/gui/scrollablecontentnode.cpp new file mode 100644 index 0000000..100d935 --- /dev/null +++ b/src/scene/gui/scrollablecontentnode.cpp @@ -0,0 +1,6 @@ +#include "scrollablecontentnode.h" + +ScrollableContentNode::ScrollableContentNode() +{ + +} diff --git a/src/scene/gui/scrollablecontentnode.h b/src/scene/gui/scrollablecontentnode.h new file mode 100644 index 0000000..0735351 --- /dev/null +++ b/src/scene/gui/scrollablecontentnode.h @@ -0,0 +1,12 @@ +#ifndef SCROLLABLECONTENTNODE_H +#define SCROLLABLECONTENTNODE_H + +#include "guinode.h" + +class ScrollableContentNode : public GUINode +{ +public: + ScrollableContentNode(); +}; + +#endif // SCROLLABLECONTENTNODE_H diff --git a/src/scene/gui/scrollbarnode.cpp b/src/scene/gui/scrollbarnode.cpp index d4d91df..2abd15e 100644 --- a/src/scene/gui/scrollbarnode.cpp +++ b/src/scene/gui/scrollbarnode.cpp @@ -14,6 +14,9 @@ ScrollBarNode::ScrollBarNode(glm::vec2 dimension, glm::vec3 bar_color): m_bar_dimension(dimension), m_bar_color(bar_color), m_bar_color_updated(false), + m_index_position(0), + m_bar_size(0), + m_total_size(0), m_bar_resized(false), m_bar_moved(false) {