hippoz/raven
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

make DocumentLayout responsive in regards to the parent's width

Browse source
This commit is contained in:
hippoz 2022-05-09 23:03:56 +03:00
parent 5d672e9eec
commit 3039646b6b
Signed by: hippoz
GPG key ID: 7C52899193467641
3 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/DocumentLayout.cpp
View file

@ -9,22 +9,26 @@ void DocumentLayout::run() {
if (!m_target) if (!m_target)
return; return;
Point point { m_target->current_geometry().x() + m_margin, m_target->current_geometry().y() + m_margin }; Point current_position { m_target->current_geometry().x() + m_margin, m_target->current_geometry().y() + m_margin };
double row_largest_height = 0.0; double largest_height_so_far = -1.0;
auto& children = m_target->children();
auto children = m_target->children(); for (auto& child : children) {
for (auto& c : children) { if (child->current_geometry().height() > largest_height_so_far) {
if (c->control_type() == ControlWidgetType::NewRow && row_largest_height) { largest_height_so_far = child->current_geometry().height();
point.add(0, row_largest_height + m_margin);
row_largest_height = 0.0;
point.set_x(0);
} }
if (c->current_geometry().height() > row_largest_height) {
row_largest_height = c->current_geometry().height(); bool new_row_because_of_control_widget = (child->control_type() == ControlWidgetType::NewRow && largest_height_so_far);
bool new_row_because_of_justification = (current_position.x() + child->current_geometry().width() + m_margin) >= m_target->current_geometry().width();
bool should_do_new_row = new_row_because_of_control_widget || new_row_because_of_justification;
if (should_do_new_row) {
current_position.add(0, largest_height_so_far + m_margin);
current_position.set_x(m_margin);
} }
c->current_geometry().set_x(point.x());
c->current_geometry().set_y(point.y()); child->current_geometry().set_x(current_position.x());
point.add(c->current_geometry().width() + m_margin, 0); child->current_geometry().set_y(current_position.y());
current_position.add(child->current_geometry().width() + m_margin, 0);
} }
} }

2
src/Window.cpp
View file

@ -112,7 +112,7 @@ void Window::run(bool block) {
m_main_widget->current_geometry().set_width(m_current_geometry.width()); m_main_widget->current_geometry().set_width(m_current_geometry.width());
m_main_widget->current_geometry().set_height(m_current_geometry.height()); m_main_widget->current_geometry().set_height(m_current_geometry.height());
} }
dispatch_full_repaint(); dispatch_full_relayout();
} }
break; break;
} }

3
src/main.cpp
View file

@ -20,8 +20,6 @@ int main() {
int number = 0; int number = 0;
window.spawn_window();
add_button->on_click = [&]() { add_button->on_click = [&]() {
number++; number++;
label->set_text(std::to_string(number)); label->set_text(std::to_string(number));
@ -32,6 +30,7 @@ int main() {
label->set_text(std::to_string(number)); label->set_text(std::to_string(number));
}; };
window.spawn_window();
window.run(true); window.run(true);
return 0; return 0;
} }