Fix more narrow conversion warnings

This commit is contained in:
Mikael Olenfalk 2020-03-22 17:33:38 +01:00 committed by ArthurSonzogni
parent c4f87a40b7
commit f3cef48328
2 changed files with 8 additions and 6 deletions

View File

@ -5,12 +5,13 @@
#include "ftxui/dom/elements.hpp" #include "ftxui/dom/elements.hpp"
#include "ftxui/screen/screen.hpp" #include "ftxui/screen/screen.hpp"
int main(int argc, const char* argv[]) { int main(int argc, const char* argv[]) {
using namespace ftxui; using namespace ftxui;
using namespace std::chrono_literals; using namespace std::chrono_literals;
std::string reset_position; std::string reset_position;
for (float percentage = 0; percentage <= 1.0; percentage += 0.002) { for (float percentage = 0.0f; percentage <= 1.0f; percentage += 0.002f) {
std::wstring data_downloaded = std::wstring data_downloaded =
std::to_wstring(int(percentage * 5000)) + L"/5000"; std::to_wstring(int(percentage * 5000)) + L"/5000";
// clang-format off // clang-format off

View File

@ -7,18 +7,19 @@
#include "ftxui/screen/screen.hpp" #include "ftxui/screen/screen.hpp"
#include "ftxui/screen/string.hpp" #include "ftxui/screen/string.hpp"
class Graph { class Graph {
public: public:
std::vector<int> operator()(int width, int height) { std::vector<int> operator()(int width, int height) {
std::vector<int> output(width); std::vector<int> output(width);
for (int i = 0; i < width; ++i) { for (int i = 0; i < width; ++i) {
float v = 0; float v = 0;
v += 0.1 * sin((i + shift) * 0.1); v += 0.1f * sin((i + shift) * 0.1f);
v += 0.2 * sin((i + shift + 10) * 0.15); v += 0.2f * sin((i + shift + 10) * 0.15f);
v += 0.1 * sin((i + shift) * 0.03); v += 0.1f * sin((i + shift) * 0.03f);
v *= height; v *= height;
v += 0.5 * height; v += 0.5f * height;
output[i] = v; output[i] = static_cast<int>(v);
} }
return output; return output;
} }