diff --git a/CHANGELOG.md b/CHANGELOG.md index fbe57ae25f95885501ff17f90c3dc83b8f5fb6c5..1b607ecef97ca28127e5c73d0fc9fe8a226dfeb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,9 @@ current (development) See #932 - Feature: Add `SliderOption::on_change`. This allows to set a callback when the slider value changes. See #938. +- Bugfix: Handle `Dropdown` with no entries. +- Bugfix: Fix crash in `LinearGradient` due to float precision and an off-by-one + mistake. See #998. ### Dom - Feature: Add `hscroll_indicator`. It display an horizontal indicator diff --git a/cmake/ftxui_set_options.cmake b/cmake/ftxui_set_options.cmake index 6e5a8e0083f95620b75c23d90e236e73b5059ee1..185739e4926eb0ded4ec0c4537853944b789fe3a 100644 --- a/cmake/ftxui_set_options.cmake +++ b/cmake/ftxui_set_options.cmake @@ -83,10 +83,6 @@ function(ftxui_set_options library) target_compile_options(${library} PRIVATE "-Wpedantic") target_compile_options(${library} PRIVATE "-Wshadow") target_compile_options(${library} PRIVATE "-Wunused") - - if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - target_compile_options(${library} PRIVATE "-Wuseless-cast") - endif() endif() endif() diff --git a/cmake/ftxui_test.cmake b/cmake/ftxui_test.cmake index 56b21bd9d6d6f767df6e7aad68bf285c19803e05..7ff1b2d7d3f2fd4ce782bb2f54aed8ffc71913f0 100644 --- a/cmake/ftxui_test.cmake +++ b/cmake/ftxui_test.cmake @@ -13,6 +13,7 @@ add_executable(ftxui-tests src/ftxui/component/component_test.cpp src/ftxui/component/component_test.cpp src/ftxui/component/container_test.cpp + src/ftxui/component/dropdown_test.cpp src/ftxui/component/hoverable_test.cpp src/ftxui/component/input_test.cpp src/ftxui/component/menu_test.cpp diff --git a/src/ftxui/component/dropdown.cpp b/src/ftxui/component/dropdown.cpp index b268dd9f39270b805eea98cea2fcc71a0578ec12..690a6e2d2fcb06dc8194bd869edb913795977937 100644 --- a/src/ftxui/component/dropdown.cpp +++ b/src/ftxui/component/dropdown.cpp @@ -47,7 +47,11 @@ Component Dropdown(DropdownOption option) { Element Render() override { radiobox.selected = util::clamp(radiobox.selected(), 0, int(radiobox.entries.size()) - 1); - title_ = radiobox.entries[selected_()]; + selected_ = util::clamp(selected_(), 0, int(radiobox.entries.size()) - 1); + + if (selected_() >= 0) { + title_ = radiobox.entries[selected_()]; + } return transform(*open_, checkbox_->Render(), radiobox_->Render()); } diff --git a/src/ftxui/component/dropdown_test.cpp b/src/ftxui/component/dropdown_test.cpp new file mode 100644 index 0000000000000000000000000000000000000000..44434d12279d630b4c89896c8544b9a1da56c344 --- /dev/null +++ b/src/ftxui/component/dropdown_test.cpp @@ -0,0 +1,34 @@ +// Copyright 2025 Arthur Sonzogni. All rights reserved. +// Use of this source code is governed by the MIT license that can be found in +// the LICENSE file. + +#include "ftxui/component/component.hpp" // for Horizontal, Vertical, Button, Tab +#include "ftxui/component/component_base.hpp" // for ComponentBase, Component +#include "ftxui/component/event.hpp" // for Event, Event::Tab, Event::TabReverse, Event::ArrowDown, Event::ArrowLeft, Event::ArrowRight, Event::ArrowUp +#include "gtest/gtest.h" // for AssertionResult, Message, TestPartResult, EXPECT_EQ, EXPECT_FALSE, Test, EXPECT_TRUE, TEST + +namespace ftxui { + +TEST(DropdownTest, Empty) { + std::vector<std::string> list = {}; + int index = 0; + auto dropdown = Dropdown(list, &index); + + dropdown->OnEvent(Event::Return); + + auto screen = Screen(8, 8); + auto document = dropdown->Render(); + Render(screen, document); + + EXPECT_EQ(screen.ToString(), + "â•â”€â”€â”€â”€â”€â”€â•®\r\n" + "│↓ │\r\n" + "├──────┤\r\n" + "│ │\r\n" + "│ │\r\n" + "│ │\r\n" + "│ │\r\n" + "╰──────╯"); +} + +} // namespace ftxui diff --git a/src/ftxui/dom/linear_gradient.cpp b/src/ftxui/dom/linear_gradient.cpp index 0f7d17612057ee9cfe6f7334093d04c441debad8..5dda646de9150d00ee065666756818baa3e6573c 100644 --- a/src/ftxui/dom/linear_gradient.cpp +++ b/src/ftxui/dom/linear_gradient.cpp @@ -97,7 +97,11 @@ Color Interpolate(const LinearGradientNormalized& gradient, float t) { // Find the right color in the gradient's stops. size_t i = 1; while (true) { - if (i > gradient.positions.size()) { + // Note that `t` might be slightly greater than 1.0 due to floating point + // precision. This is why we need to handle the case where `t` is greater + // than the last stop's position. + // See https://github.com/ArthurSonzogni/FTXUI/issues/998 + if (i >= gradient.positions.size()) { const float half = 0.5F; return Color::Interpolate(half, gradient.colors.back(), gradient.colors.back());