From b63aa9e3758ed567ce2b50a8c86ed4054000b47b Mon Sep 17 00:00:00 2001
From: Jhon Adams <github@l124rd.com>
Date: Wed, 1 Jun 2022 12:13:39 -0700
Subject: [PATCH] Swap incorrect width/height mapping (#409)
width and height were being set using the incorrect axes resulting in incorrect canvas dimensions
Co-authored-by: ArthurSonzogni <sonzogniarthur@gmail.com>
---
CHANGELOG.md | 1 +
src/ftxui/dom/canvas.cpp | 4 ++--
src/ftxui/dom/canvas_test.cpp | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4a7983e..0f2bbf54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ current (development)
- Bugfix: Fix the selected/focused area. It used to be 1 cell larger/longer than
requested
- Bugfix: Forward the selected/focused area from the child in gridbox.
+- Bugfix: Fix incorrect Canvas computed dimensions.
### Screen
- Feature: add `Box::Union(a,b) -> Box`
diff --git a/src/ftxui/dom/canvas.cpp b/src/ftxui/dom/canvas.cpp
index 0917786d..5621f026 100644
--- a/src/ftxui/dom/canvas.cpp
+++ b/src/ftxui/dom/canvas.cpp
@@ -871,8 +871,8 @@ Element canvas(int width, int height, std::function<void(Canvas&)> fn) {
}
void Render(Screen& screen) final {
- int width = (box_.y_max - box_.y_min + 1) * 2;
- int height = (box_.x_max - box_.x_min + 1) * 4;
+ int width = (box_.x_max - box_.x_min + 1) * 2;
+ int height = (box_.y_max - box_.y_min + 1) * 4;
canvas_ = Canvas(width, height);
fn_(canvas_);
CanvasNodeBase::Render(screen);
diff --git a/src/ftxui/dom/canvas_test.cpp b/src/ftxui/dom/canvas_test.cpp
index fe85b0a4..3c890c9c 100644
--- a/src/ftxui/dom/canvas_test.cpp
+++ b/src/ftxui/dom/canvas_test.cpp
@@ -39,7 +39,7 @@ TEST(CanvasTest, GoldPoint) {
});
Screen screen(30, 10);
Render(screen, element);
- EXPECT_EQ(Hash(screen.ToString()), -1195891837);
+ EXPECT_EQ(Hash(screen.ToString()), 2143518726);
}
TEST(CanvasTest, GoldPointColor) {
@@ -54,7 +54,7 @@ TEST(CanvasTest, GoldPointColor) {
});
Screen screen(30, 10);
Render(screen, element);
- EXPECT_EQ(Hash(screen.ToString()), 1109533029);
+ EXPECT_EQ(Hash(screen.ToString()), 1264423298);
}
TEST(CanvasTest, GoldBlock) {
@@ -72,7 +72,7 @@ TEST(CanvasTest, GoldBlock) {
});
Screen screen(30, 10);
Render(screen, element);
- EXPECT_EQ(Hash(screen.ToString()), 817159424);
+ EXPECT_EQ(Hash(screen.ToString()), 3826174883);
}
TEST(CanvasTest, GoldBlockColor) {
@@ -87,7 +87,7 @@ TEST(CanvasTest, GoldBlockColor) {
});
Screen screen(30, 10);
Render(screen, element);
- EXPECT_EQ(Hash(screen.ToString()), 2869205941);
+ EXPECT_EQ(Hash(screen.ToString()), 3048712696);
}
TEST(CanvasTest, GoldText) {
--
GitLab