amass/FTXUI
1
0
Fork 0
mirror of https://github.com/ArthurSonzogni/FTXUI.git synced 2024-10-31 08:19:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Gauge of size zero. (#200)

Browse Source
This commit is contained in:
Arthur Sonzogni 2021-09-04 19:58:02 +02:00 committed by GitHub
parent b99106a7c9
commit ed28bad02a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ftxui/component/component_fuzzer.cpp
View File

@ -23,16 +23,17 @@ std::string GeneratorString(const char*& data, size_t& size) {
while (index < size && data[index])
++index;
auto out = std::string(data, data + index);
data += index;
size -= index;
// The input component do not support invalid UTF8 yet.
try {
auto out = std::string(data, data + index);
auto w_out = to_wstring(out);
data += index;
size -= index;
return std::move(out);
to_wstring(out);
} catch (...) {
// The input component do not support invalid UTF8 yet.
return "0";
}
return std::move(out);
}
int GeneratorInt(const char* data, size_t size) {

10
src/ftxui/dom/gauge.cpp
View File

@ -1,3 +1,4 @@
#include <cmath>
#include <memory> // for allocator, make_shared
#include <string> // for string
@ -9,7 +10,7 @@
namespace ftxui {
static std::string charset[] = {
static std::string charset[11] = {
#if defined(FTXUI_MICROSOFT_TERMINAL_FALLBACK)
// Microsoft's terminals often use fonts not handling the 8 unicode
// characters for representing the whole gauge. Fallback with less.
@ -23,7 +24,7 @@ static std::string charset[] = {
class Gauge : public Node {
public:
Gauge(float progress) : progress_(progress) {}
Gauge(float progress) : progress_(std::min(std::max(progress, 0.f), 1.f)) {}
void ComputeRequirement() override {
requirement_.flex_grow_x = 1;
@ -35,7 +36,10 @@ class Gauge : public Node {
}
void Render(Screen& screen) override {
float y = box_.y_min;
int y = box_.y_min;
if (y > box_.y_max)
return;
float limit = box_.x_min + progress_ * (box_.x_max - box_.x_min + 1);
int limit_int = limit;
int x = box_.x_min;