amass/FTXUI
1
0
Fork 0
mirror of https://github.com/ArthurSonzogni/FTXUI.git synced 2024-11-26 20:47:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make flexible element to be shrinkable.

Browse Source 
This make the application "just-fast" to look better.
This commit is contained in:
ArthurSonzogni 2020-05-02 17:39:42 +02:00
parent cccbe5baa9
commit 1974e9f9fc
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ftxui/dom/hbox.cpp
View File

@ -53,7 +53,7 @@ class HBox : public Node {
child_box.x_max = x + child->requirement().min.x - 1; 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 / int added_space = remaining_extra_space * child->requirement().flex.x /
remaining_flex; remaining_flex;
remaining_extra_space -= added_space; remaining_extra_space -= added_space;

4
src/ftxui/dom/hbox_test.cpp
View File

@ -53,7 +53,7 @@ TEST(HBoxTest, ScreenSmaller1Flex) {
Screen screen(11, 1); Screen screen(11, 1);
Render(screen, root.get()); Render(screen, root.get());
EXPECT_EQ("text_1text_", screen.ToString()); EXPECT_EQ("text_text_2", screen.ToString());
} }
TEST(HBoxTest, ScreenSmaller2Flex) { TEST(HBoxTest, ScreenSmaller2Flex) {
@ -61,7 +61,7 @@ TEST(HBoxTest, ScreenSmaller2Flex) {
Screen screen(10, 1); Screen screen(10, 1);
Render(screen, root.get()); Render(screen, root.get());
EXPECT_EQ("text_1text", screen.ToString()); EXPECT_EQ("texttext_2", screen.ToString());
} }
TEST(HBoxTest, ScreenFitFlex) { TEST(HBoxTest, ScreenFitFlex) {

2
src/ftxui/dom/vbox.cpp
View File

@ -54,7 +54,7 @@ class VBox : public Node {
child_box.y_max = y + child->requirement().min.y - 1; 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 / int added_space = remaining_extra_space * child->requirement().flex.y /
remaining_flex; remaining_flex;
remaining_extra_space -= added_space; remaining_extra_space -= added_space;

2
src/ftxui/dom/vbox_test.cpp
View File

@ -45,7 +45,7 @@ TEST(VBoxTest, ScreenSmaller1Flex) {
Screen screen(6, 1); Screen screen(6, 1);
Render(screen, root.get()); Render(screen, root.get());
EXPECT_EQ("text_1", screen.ToString()); EXPECT_EQ("text_2", screen.ToString());
} }
TEST(VBoxTest, ScreenFitFlex) { TEST(VBoxTest, ScreenFitFlex) {