From 30dbaeb2b175c1e67f57aba748ced1a2280fb56d Mon Sep 17 00:00:00 2001 From: dec05eba Date: Thu, 1 Oct 2020 19:12:33 +0200 Subject: Matrix: add room name and avatar of the current room at the top --- include/Body.hpp | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'include/Body.hpp') diff --git a/include/Body.hpp b/include/Body.hpp index 60b976d..d2a3424 100644 --- a/include/Body.hpp +++ b/include/Body.hpp @@ -1,6 +1,7 @@ #pragma once #include "Text.hpp" +#include "AsyncImageLoader.hpp" #include #include #include @@ -154,23 +155,9 @@ namespace QuickMedia { private: void draw_item(sf::RenderWindow &window, BodyItem *item, const sf::Vector2f &pos, const sf::Vector2f &size, const float item_height, const int item_index, const Json::Value &content_progress); private: - enum class LoadingState { - NOT_LOADED, - LOADING, - FINISHED_LOADING, - APPLIED_TO_TEXTURE - }; - - struct ThumbnailData { - bool referenced = false; - LoadingState loading_state = LoadingState::NOT_LOADED; - sf::Texture texture; - std::unique_ptr image; // Set in another thread, and then reset after loading it into |texture| - }; Program *program; - void load_thumbnail_from_url(const std::string &url, bool local, sf::Vector2i thumbnail_resize_target_size, std::shared_ptr thumbnail_data); std::unordered_map> item_thumbnail_textures; - bool loading_thumbnail; + AsyncImageLoader async_image_loader; int selected_item; int prev_selected_item; float page_scroll; -- cgit v1.2.3