zhangyiss/FTXUI
1
0
Fork 0
mirror of https://github.com/ArthurSonzogni/FTXUI.git synced 2025-11-04 13:38:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Swap incorrect width/height mapping (#409)

Browse Source 
width and height were being set using the incorrect axes resulting in incorrect canvas dimensions

Co-authored-by: ArthurSonzogni <sonzogniarthur@gmail.com>
This commit is contained in:
Jhon Adams
2022-06-01 12:13:39 -07:00
committed by GitHub
parent ed5b4cec49
commit b63aa9e375
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -10,6 +10,7 @@ current (development)
- Bugfix: Fix the selected/focused area. It used to be 1 cell larger/longer than - Bugfix: Fix the selected/focused area. It used to be 1 cell larger/longer than
requested requested
- Bugfix: Forward the selected/focused area from the child in gridbox. - Bugfix: Forward the selected/focused area from the child in gridbox.
- Bugfix: Fix incorrect Canvas computed dimensions.
### Screen ### Screen
- Feature: add `Box::Union(a,b) -> Box` - Feature: add `Box::Union(a,b) -> Box`

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

@@ -871,8 +871,8 @@ Element canvas(int width, int height, std::function<void(Canvas&)> fn) {
} }
void Render(Screen& screen) final { void Render(Screen& screen) final {
int width = (box_.y_max - box_.y_min + 1) * 2; int width = (box_.x_max - box_.x_min + 1) * 2;
int height = (box_.x_max - box_.x_min + 1) * 4; int height = (box_.y_max - box_.y_min + 1) * 4;
canvas_ = Canvas(width, height); canvas_ = Canvas(width, height);
fn_(canvas_); fn_(canvas_);
CanvasNodeBase::Render(screen); CanvasNodeBase::Render(screen);

8
src/ftxui/dom/canvas_test.cpp
View File

@@ -39,7 +39,7 @@ TEST(CanvasTest, GoldPoint) {
}); });
Screen screen(30, 10); Screen screen(30, 10);
Render(screen, element); Render(screen, element);
EXPECT_EQ(Hash(screen.ToString()), -1195891837); EXPECT_EQ(Hash(screen.ToString()), 2143518726);
} }
TEST(CanvasTest, GoldPointColor) { TEST(CanvasTest, GoldPointColor) {
@@ -54,7 +54,7 @@ TEST(CanvasTest, GoldPointColor) {
}); });
Screen screen(30, 10); Screen screen(30, 10);
Render(screen, element); Render(screen, element);
EXPECT_EQ(Hash(screen.ToString()), 1109533029); EXPECT_EQ(Hash(screen.ToString()), 1264423298);
} }
TEST(CanvasTest, GoldBlock) { TEST(CanvasTest, GoldBlock) {
@@ -72,7 +72,7 @@ TEST(CanvasTest, GoldBlock) {
}); });
Screen screen(30, 10); Screen screen(30, 10);
Render(screen, element); Render(screen, element);
EXPECT_EQ(Hash(screen.ToString()), 817159424); EXPECT_EQ(Hash(screen.ToString()), 3826174883);
} }
TEST(CanvasTest, GoldBlockColor) { TEST(CanvasTest, GoldBlockColor) {
@@ -87,7 +87,7 @@ TEST(CanvasTest, GoldBlockColor) {
}); });
Screen screen(30, 10); Screen screen(30, 10);
Render(screen, element); Render(screen, element);
EXPECT_EQ(Hash(screen.ToString()), 2869205941); EXPECT_EQ(Hash(screen.ToString()), 3048712696);
} }
TEST(CanvasTest, GoldText) { TEST(CanvasTest, GoldText) {