diff --git a/external/color/color.cpp b/external/color/color.cpp index 9c7fe5c..4f30061 100644 --- a/external/color/color.cpp +++ b/external/color/color.cpp @@ -13,7 +13,7 @@ Color::Color(std::string hex) { if (hex.length() == 6) { hex = "FF" + hex; } - p_color = std::stoul(hex, nullptr, 16); + p_color = (uint32_t)std::stoul(hex, nullptr, 16); } Color::Color(Colors color) { @@ -180,7 +180,7 @@ Color::Color(Colors color) { case Colors::Medium_Orchid: Color(0x93, 0x70, 0xDB); break; - case Colors::Medium_Sea_Green: + case Colors::Medium_Seagreen: Color(0x42, 0x6F, 0x42); break; case Colors::Medium_Slate_Blue: @@ -326,15 +326,15 @@ uint32_t Color::color() const { } uint8_t Color::red() const { - return (p_color >> 24) & 0xFF; + return (uint8_t)((p_color >> 24) & 0xFF); } uint8_t Color::green() const { - return (p_color >> 16) & 0xFF; + return (uint8_t)((p_color >> 16) & 0xFF); } uint8_t Color::blue() const { - return (p_color >> 8) & 0xFF; + return (uint8_t)((p_color >> 8) & 0xFF); } uint8_t Color::alpha() const { diff --git a/external/color/color.hpp b/external/color/color.hpp index cb33dcc..4c42433 100644 --- a/external/color/color.hpp +++ b/external/color/color.hpp @@ -60,7 +60,6 @@ class Color { Medium_Forest_Green, Medium_Goldenrod, Medium_Orchid, - Medium_Sea_Green, Medium_Seagreen, Medium_Slate_Blue, Medium_Spring_Green, diff --git a/src/UI/UI_combobox.cpp b/src/UI/UI_combobox.cpp index 803552f..f5c77f8 100644 --- a/src/UI/UI_combobox.cpp +++ b/src/UI/UI_combobox.cpp @@ -5,7 +5,7 @@ UI_combobox::UI_combobox() { } -UI_combobox::UI_combobox(std::string id, std::string text, Color fg_color, Color bg_color, std::vector options, int selected, UI_combobox_on_change on_change) +UI_combobox::UI_combobox(std::string id, std::string text, Color fg_color, Color bg_color, std::vector options, size_t selected, UI_combobox_on_change on_change) : UI_x_boxes(id, UI_COMBOBOX_TYPE, text, fg_color, bg_color, options), p_selected(selected), p_on_change(on_change) { } diff --git a/src/UI/UI_combobox.hpp b/src/UI/UI_combobox.hpp index 6009610..be2bd7a 100644 --- a/src/UI/UI_combobox.hpp +++ b/src/UI/UI_combobox.hpp @@ -4,13 +4,13 @@ #include "UI_x_boxes.hpp" #define UI_COMBOBOX_TYPE std::string("UIcombobox") -typedef void (*UI_combobox_on_change) (std::string id, int selected); +typedef void (*UI_combobox_on_change) (std::string id, size_t selected); class UI_combobox : public UI_x_boxes { public: UI_combobox(); - UI_combobox(std::string id, std::string text, Color fg_color, Color bg_color, std::vector options, int selected, UI_combobox_on_change on_change = nullptr); + UI_combobox(std::string id, std::string text, Color fg_color, Color bg_color, std::vector options, size_t selected, UI_combobox_on_change on_change = nullptr); UI_combobox(std::string id, std::string text, Color fg_color, Color bg_color, std::vector options, UI_combobox_on_change on_change = nullptr); UI_combobox(const json& j);