visual fixes
This commit is contained in:
@@ -146,8 +146,8 @@ Button* Button::textSupplier(wstringsupplier supplier) {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Button::setSize(glm::vec2 size) {
|
void Button::refresh() {
|
||||||
Panel::setSize(size);
|
Panel::refresh();
|
||||||
if (label) {
|
if (label) {
|
||||||
label->setSize(size-vec2(padding.z+padding.x, padding.w+padding.y));
|
label->setSize(size-vec2(padding.z+padding.x, padding.w+padding.y));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ namespace gui {
|
|||||||
|
|
||||||
virtual Button* textSupplier(wstringsupplier supplier);
|
virtual Button* textSupplier(wstringsupplier supplier);
|
||||||
|
|
||||||
virtual void setSize(glm::vec2 size) override;
|
virtual void refresh() override;
|
||||||
};
|
};
|
||||||
|
|
||||||
class RichButton : public Container {
|
class RichButton : public Container {
|
||||||
@@ -112,7 +112,7 @@ namespace gui {
|
|||||||
bool valid = true;
|
bool valid = true;
|
||||||
public:
|
public:
|
||||||
TextBox(std::wstring placeholder,
|
TextBox(std::wstring placeholder,
|
||||||
glm::vec4 padding=glm::vec4(2.0f));
|
glm::vec4 padding=glm::vec4(4.0f));
|
||||||
|
|
||||||
virtual std::shared_ptr<UINode> getAt(glm::vec2 pos, std::shared_ptr<UINode> self) override;
|
virtual std::shared_ptr<UINode> getAt(glm::vec2 pos, std::shared_ptr<UINode> self) override;
|
||||||
|
|
||||||
|
|||||||
@@ -164,6 +164,7 @@ int Panel::getMaxLength() const {
|
|||||||
|
|
||||||
void Panel::setPadding(glm::vec4 padding) {
|
void Panel::setPadding(glm::vec4 padding) {
|
||||||
this->padding = padding;
|
this->padding = padding;
|
||||||
|
refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
glm::vec4 Panel::getPadding() const {
|
glm::vec4 Panel::getPadding() const {
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ static std::shared_ptr<Label> create_label(gui::wstringsupplier supplier) {
|
|||||||
std::shared_ptr<UINode> HudRenderer::createDebugPanel(Engine* engine) {
|
std::shared_ptr<UINode> HudRenderer::createDebugPanel(Engine* engine) {
|
||||||
auto level = frontend->getLevel();
|
auto level = frontend->getLevel();
|
||||||
|
|
||||||
auto panel = std::make_shared<Panel>(vec2(250, 200), vec4(5.0f), 1.0f);
|
auto panel = std::make_shared<Panel>(vec2(250, 200), vec4(5.0f), 2.0f);
|
||||||
panel->listenInterval(0.5f, [this]() {
|
panel->listenInterval(0.5f, [this]() {
|
||||||
fpsString = std::to_wstring(fpsMax)+L" / "+std::to_wstring(fpsMin);
|
fpsString = std::to_wstring(fpsMax)+L" / "+std::to_wstring(fpsMin);
|
||||||
fpsMin = fps;
|
fpsMin = fps;
|
||||||
@@ -152,7 +152,7 @@ std::shared_ptr<UINode> HudRenderer::createDebugPanel(Engine* engine) {
|
|||||||
}
|
}
|
||||||
{
|
{
|
||||||
auto checkbox = std::make_shared<FullCheckBox>(
|
auto checkbox = std::make_shared<FullCheckBox>(
|
||||||
L"Show Chunk Borders", vec2(400, 32)
|
L"Show Chunk Borders", vec2(400, 24)
|
||||||
);
|
);
|
||||||
checkbox->supplier([=]() {
|
checkbox->supplier([=]() {
|
||||||
return engine->getSettings().debug.showChunkBorders;
|
return engine->getSettings().debug.showChunkBorders;
|
||||||
|
|||||||
Reference in New Issue
Block a user