missing-content panel scroll fix
This commit is contained in:
@@ -23,7 +23,7 @@ GUI::GUI() {
|
||||
|
||||
menu = std::make_shared<PagesControl>();
|
||||
container->add(menu);
|
||||
container->scrollable(false);
|
||||
container->setScrollable(false);
|
||||
}
|
||||
|
||||
GUI::~GUI() {
|
||||
|
||||
@@ -95,7 +95,7 @@ Button::Button(std::shared_ptr<UINode> content, glm::vec4 padding)
|
||||
setSize(content->getSize()+vec2(padding[0]+padding[2]+margin[0]+margin[2],
|
||||
padding[1]+padding[3]+margin[1]+margin[3]));
|
||||
add(content);
|
||||
scrollable(false);
|
||||
setScrollable(false);
|
||||
setHoverColor(glm::vec4(0.05f, 0.1f, 0.15f, 0.75f));
|
||||
}
|
||||
|
||||
@@ -117,7 +117,7 @@ Button::Button(
|
||||
if (action) {
|
||||
listenAction(action);
|
||||
}
|
||||
scrollable(false);
|
||||
setScrollable(false);
|
||||
|
||||
label = std::make_shared<Label>(text);
|
||||
label->setAlign(Align::center);
|
||||
@@ -253,7 +253,7 @@ void TextBox::drawBackground(const GfxContext* pctx, Assets* assets) {
|
||||
label->setColor(vec4(1.0f));
|
||||
label->setText(input);
|
||||
}
|
||||
scrollable(false);
|
||||
setScrollable(false);
|
||||
}
|
||||
|
||||
void TextBox::typed(unsigned int codepoint) {
|
||||
@@ -343,7 +343,7 @@ InputBindBox::InputBindBox(Binding& binding, vec4 padding)
|
||||
binding(binding) {
|
||||
label = std::make_shared<Label>(L"");
|
||||
add(label);
|
||||
scrollable(false);
|
||||
setScrollable(false);
|
||||
}
|
||||
|
||||
void InputBindBox::drawBackground(const GfxContext* pctx, Assets* assets) {
|
||||
|
||||
@@ -62,7 +62,7 @@ void Container::act(float delta) {
|
||||
|
||||
void Container::scrolled(int value) {
|
||||
int diff = (actualLength-getSize().y);
|
||||
if (diff > 0 && scrollable_) {
|
||||
if (diff > 0 && scrollable) {
|
||||
scroll += value * 40;
|
||||
if (scroll > 0)
|
||||
scroll = 0;
|
||||
@@ -74,8 +74,8 @@ void Container::scrolled(int value) {
|
||||
}
|
||||
}
|
||||
|
||||
void Container::scrollable(bool flag) {
|
||||
scrollable_ = flag;
|
||||
void Container::setScrollable(bool flag) {
|
||||
scrollable = flag;
|
||||
}
|
||||
|
||||
void Container::draw(const GfxContext* pctx, Assets* assets) {
|
||||
|
||||
@@ -30,7 +30,7 @@ namespace gui {
|
||||
std::vector<IntervalEvent> intervalEvents;
|
||||
int scroll = 0;
|
||||
int actualLength = 0;
|
||||
bool scrollable_ = true;
|
||||
bool scrollable = true;
|
||||
public:
|
||||
Container(glm::vec2 coord, glm::vec2 size);
|
||||
|
||||
@@ -43,7 +43,7 @@ namespace gui {
|
||||
virtual void add(std::shared_ptr<UINode> node, glm::vec2 coord);
|
||||
virtual void remove(std::shared_ptr<UINode> node);
|
||||
virtual void scrolled(int value) override;
|
||||
virtual void scrollable(bool flag);
|
||||
virtual void setScrollable(bool flag);
|
||||
void listenInterval(float interval, ontimeout callback, int repeat=-1);
|
||||
virtual glm::vec2 contentOffset() override {return glm::vec2(0.0f, scroll);};
|
||||
virtual void setSize(glm::vec2 size);
|
||||
|
||||
Reference in New Issue
Block a user