From 1974e9f9fc242b28bd4229b66016bc7b38de075b Mon Sep 17 00:00:00 2001 From: ArthurSonzogni Date: Sat, 2 May 2020 17:39:42 +0200 Subject: [PATCH] Make flexible element to be shrinkable. This make the application "just-fast" to look better. --- src/ftxui/dom/hbox.cpp | 2 +- src/ftxui/dom/hbox_test.cpp | 4 ++-- src/ftxui/dom/vbox.cpp | 2 +- src/ftxui/dom/vbox_test.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ftxui/dom/hbox.cpp b/src/ftxui/dom/hbox.cpp index 8bd5f6a..1065b2e 100644 --- a/src/ftxui/dom/hbox.cpp +++ b/src/ftxui/dom/hbox.cpp @@ -53,7 +53,7 @@ class HBox : public Node { child_box.x_max = x + child->requirement().min.x - 1; - if (child->requirement().flex.x && remaining_extra_space > 0) { + if (child->requirement().flex.x) { int added_space = remaining_extra_space * child->requirement().flex.x / remaining_flex; remaining_extra_space -= added_space; diff --git a/src/ftxui/dom/hbox_test.cpp b/src/ftxui/dom/hbox_test.cpp index 7c7ac16..55564b5 100644 --- a/src/ftxui/dom/hbox_test.cpp +++ b/src/ftxui/dom/hbox_test.cpp @@ -53,7 +53,7 @@ TEST(HBoxTest, ScreenSmaller1Flex) { Screen screen(11, 1); Render(screen, root.get()); - EXPECT_EQ("text_1text_", screen.ToString()); + EXPECT_EQ("text_text_2", screen.ToString()); } TEST(HBoxTest, ScreenSmaller2Flex) { @@ -61,7 +61,7 @@ TEST(HBoxTest, ScreenSmaller2Flex) { Screen screen(10, 1); Render(screen, root.get()); - EXPECT_EQ("text_1text", screen.ToString()); + EXPECT_EQ("texttext_2", screen.ToString()); } TEST(HBoxTest, ScreenFitFlex) { diff --git a/src/ftxui/dom/vbox.cpp b/src/ftxui/dom/vbox.cpp index b355171..411ab46 100644 --- a/src/ftxui/dom/vbox.cpp +++ b/src/ftxui/dom/vbox.cpp @@ -54,7 +54,7 @@ class VBox : public Node { child_box.y_max = y + child->requirement().min.y - 1; - if (child->requirement().flex.y && remaining_extra_space > 0) { + if (child->requirement().flex.y) { int added_space = remaining_extra_space * child->requirement().flex.y / remaining_flex; remaining_extra_space -= added_space; diff --git a/src/ftxui/dom/vbox_test.cpp b/src/ftxui/dom/vbox_test.cpp index 1245806..770c8d0 100644 --- a/src/ftxui/dom/vbox_test.cpp +++ b/src/ftxui/dom/vbox_test.cpp @@ -45,7 +45,7 @@ TEST(VBoxTest, ScreenSmaller1Flex) { Screen screen(6, 1); Render(screen, root.get()); - EXPECT_EQ("text_1", screen.ToString()); + EXPECT_EQ("text_2", screen.ToString()); } TEST(VBoxTest, ScreenFitFlex) {