fix gui alert window size

This commit is contained in:
MihailRis
2025-01-28 05:09:18 +03:00
parent dece2e25bc
commit 756ff4a2c7
7 changed files with 49 additions and 18 deletions
+5 -3
View File
@@ -65,9 +65,10 @@ void Menu::setPage(Page page, bool history) {
setSize(current.panel->getSize());
}
void Menu::back() {
if (pageStack.empty())
return;
bool Menu::back() {
if (pageStack.empty()) {
return false;
}
Page page = pageStack.top();
pageStack.pop();
@@ -77,6 +78,7 @@ void Menu::back() {
}
setPage(page, false);
return true;
}
void Menu::setPageLoader(PageLoaderFunc loader) {
+1 -1
View File
@@ -54,7 +54,7 @@ namespace gui {
PageLoaderFunc getPageLoader();
/// @brief Set page to previous saved in history
void back();
bool back();
/// @brief Clear pages history
void clearHistory();
+6 -8
View File
@@ -70,9 +70,6 @@ void Panel::remove(const std::shared_ptr<UINode> &node) {
void Panel::refresh() {
UINode::refresh();
std::stable_sort(nodes.begin(), nodes.end(), [](auto a, auto b) {
return a->getZIndex() < b->getZIndex();
});
float x = padding.x;
float y = padding.y;
@@ -80,20 +77,21 @@ void Panel::refresh() {
if (orientation == Orientation::vertical) {
float maxw = size.x;
for (auto& node : nodes) {
glm::vec2 nodesize = node->getSize();
const glm::vec4 margin = node->getMargin();
y += margin.y;
float ex = x + margin.x;
node->setPos(glm::vec2(ex, y));
y += nodesize.y + margin.w + interval;
float width = size.x - padding.x - padding.z - margin.x - margin.z;
if (node->isResizing()) {
node->setSize(glm::vec2(width, nodesize.y));
node->setMaxSize({width, node->getMaxSize().y});
node->setSize(glm::vec2(width, node->getSize().y));
}
node->refresh();
maxw = fmax(maxw, ex+node->getSize().x+margin.z+padding.z);
glm::vec2 nodeSize = node->getSize();
y += nodeSize.y + margin.w + interval;
maxw = fmax(maxw, ex+nodeSize.x+margin.z+padding.z);
}
actualLength = y + padding.w;
} else {
+11 -1
View File
@@ -195,7 +195,8 @@ glm::vec2 UINode::getSize() const {
void UINode::setSize(glm::vec2 size) {
this->size = glm::vec2(
glm::max(minSize.x, size.x), glm::max(minSize.y, size.y)
glm::max(minSize.x, glm::min(maxSize.x, size.x)),
glm::max(minSize.y, glm::min(maxSize.y, size.y))
);
}
@@ -208,6 +209,15 @@ void UINode::setMinSize(glm::vec2 minSize) {
setSize(getSize());
}
glm::vec2 UINode::getMaxSize() const {
return maxSize;
}
void UINode::setMaxSize(glm::vec2 maxSize) {
this->maxSize = maxSize;
setSize(getSize());
}
void UINode::setColor(glm::vec4 color) {
this->color = color;
this->hoverColor = color;
+4
View File
@@ -75,6 +75,8 @@ namespace gui {
glm::vec2 size;
/// @brief minimal element size
glm::vec2 minSize {1.0f};
/// @brief maximal element size
glm::vec2 maxSize {1e6f};
/// @brief element primary color (background-color or text-color if label)
glm::vec4 color {1.0f};
/// @brief element color when mouse is over it
@@ -224,6 +226,8 @@ namespace gui {
virtual void setSize(glm::vec2 size);
virtual glm::vec2 getMinSize() const;
virtual void setMinSize(glm::vec2 size);
virtual glm::vec2 getMaxSize() const;
virtual void setMaxSize(glm::vec2 size);
/// @brief Called in containers when new element added
virtual void refresh() {};
virtual void fullRefresh() {