diff options
Diffstat (limited to 'src/QuickMedia.cpp')
| -rw-r--r-- | src/QuickMedia.cpp | 149 |
1 files changed, 74 insertions, 75 deletions
diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index 640ec16..6b85d34 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -247,7 +247,7 @@ namespace QuickMedia { auto body_item = BodyItem::create(std::move(title)); if(!description.empty()) { body_item->set_description(std::move(description)); - body_item->set_description_color(get_current_theme().faded_text_color); + body_item->set_description_color(get_theme().faded_text_color); } body_item->url = std::to_string(handlers.size()); handlers.push_back(std::move(handler)); @@ -593,7 +593,6 @@ namespace QuickMedia { set_resource_loader_root_path(resources_root.c_str()); set_use_system_fonts(get_config().use_system_fonts); - init_themes(); if(!is_touch_enabled()) { if(!circle_mask_shader.loadFromFile(resources_root + "shaders/circle_mask.glsl", sf::Shader::Type::Fragment)) { @@ -601,7 +600,7 @@ namespace QuickMedia { abort(); } - if(get_current_theme().blur_enabled) { + if(get_theme().drop_shadow) { if(!rounded_rectangle_shader.loadFromFile(resources_root + "shaders/rounded_rectangle.glsl", sf::Shader::Type::Fragment)) { show_notification("QuickMedia", "Failed to load " + resources_root + "/shaders/rounded_rectangle.glsl", Urgency::CRITICAL); abort(); @@ -1329,7 +1328,7 @@ namespace QuickMedia { body_item->url = "https://www.youtube.com/watch?v=" + video_id_str; body_item->thumbnail_url = "https://img.youtube.com/vi/" + video_id_str + "/mqdefault.jpg"; body_item->set_description("Watched " + seconds_to_relative_time_str(time_now - timestamp.asInt64())); - body_item->set_description_color(get_current_theme().faded_text_color); + body_item->set_description_color(get_theme().faded_text_color); body_item->thumbnail_size = sf::Vector2i(192, 108); history_items.push_back(std::move(body_item)); } @@ -1406,7 +1405,7 @@ namespace QuickMedia { // TODO: Add thumbnail auto body_item = BodyItem::create(manga_name.asString()); body_item->set_description("Last read " + seconds_to_relative_time_str(now - last_modified_time)); - body_item->set_description_color(get_current_theme().faded_text_color); + body_item->set_description_color(get_theme().faded_text_color); if(strcmp(plugin_name, "manganelo") == 0) body_item->url = "https://manganelo.com/manga/" + base64_url_decode(filename.string()); @@ -1634,7 +1633,7 @@ namespace QuickMedia { if(!tabs[selected_tab].search_bar) { shade_extra_height = std::floor(10.0f * get_config().scale); sf::RectangleShape shade_top(sf::Vector2f(window_size.x, shade_extra_height)); - shade_top.setFillColor(get_current_theme().shade_color); + shade_top.setFillColor(get_theme().shade_color); window.draw(shade_top); } @@ -2043,10 +2042,10 @@ namespace QuickMedia { } sf::RectangleShape more_items_above_rect; - more_items_above_rect.setFillColor(get_current_theme().more_items_color); + more_items_above_rect.setFillColor(get_theme().more_items_color); sf::RectangleShape more_items_below_rect; - more_items_below_rect.setFillColor(get_current_theme().more_items_color); + more_items_below_rect.setFillColor(get_theme().more_items_color); sf::Event event; sf::Clock frame_timer; @@ -2170,18 +2169,18 @@ namespace QuickMedia { if(tab_associated_data[selected_tab].fetching_next_page_running) { double progress = 0.5 + std::sin(std::fmod(gradient_inc, 360.0) * 0.017453292519943295 - 1.5707963267948966*0.5) * 0.5; gradient_inc += (frame_time_ms * 0.5); - sf::Color bottom_color = interpolate_colors(get_current_theme().background_color, get_current_theme().loading_bar_color, progress); + sf::Color bottom_color = interpolate_colors(get_theme().background_color, get_theme().loading_bar_color, progress); if(tabs[selected_tab].body->attach_side == AttachSide::TOP) { - gradient_points[0].color = get_current_theme().background_color; - gradient_points[1].color = get_current_theme().background_color; + gradient_points[0].color = get_theme().background_color; + gradient_points[1].color = get_theme().background_color; gradient_points[2].color = bottom_color; gradient_points[3].color = bottom_color; } else if(tabs[selected_tab].body->attach_side == AttachSide::BOTTOM) { gradient_points[0].color = bottom_color; gradient_points[1].color = bottom_color; - gradient_points[2].color = get_current_theme().background_color; - gradient_points[3].color = get_current_theme().background_color; + gradient_points[2].color = get_theme().background_color; + gradient_points[3].color = get_theme().background_color; } } @@ -2335,7 +2334,7 @@ namespace QuickMedia { ui_tabs.set_text(i, tab.page->get_title()); } - window.clear(get_current_theme().background_color); + window.clear(get_theme().background_color); page_loop_render(window, tabs, selected_tab, tab_associated_data[selected_tab], json_chapters, ui_tabs); if(tabs[selected_tab].body->get_num_items() > 0) { @@ -2511,7 +2510,7 @@ namespace QuickMedia { goto task_end; } - window.clear(get_current_theme().background_color); + window.clear(get_theme().background_color); load_sprite.setPosition(window_size.x * 0.5f, window_size.y * 0.5f); load_sprite.setRotation(load_sprite_timer.getElapsedTime().asSeconds() * 400.0); window.draw(load_sprite); @@ -3229,7 +3228,7 @@ namespace QuickMedia { matrix->update(); if(!video_loaded) { - window.clear(get_current_theme().background_color); + window.clear(get_theme().background_color); load_sprite.setPosition(window_size.x * 0.5f, window_size.y * 0.5f); load_sprite.setRotation(load_sprite_timer.getElapsedTime().asSeconds() * 400.0); window.draw(load_sprite); @@ -3483,7 +3482,7 @@ namespace QuickMedia { break; } - window.clear(get_current_theme().background_color); + window.clear(get_theme().background_color); load_sprite.setPosition(window_size.x * 0.5f, window_size.y * 0.5f); load_sprite.setRotation(load_sprite_timer.getElapsedTime().asSeconds() * 400.0); window.draw(load_sprite); @@ -3506,7 +3505,7 @@ namespace QuickMedia { sf::Texture image_texture; sf::Sprite image; sf::Text error_message("", *FontLoader::get_font(FontLoader::FontType::LATIN), std::floor(30 * get_config().scale * get_config().font_scale)); - error_message.setFillColor(get_current_theme().text_color); + error_message.setFillColor(get_theme().text_color); bool download_in_progress = false; sf::Event event; @@ -3676,7 +3675,7 @@ namespace QuickMedia { image.setPosition(std::floor(content_size.x * 0.5f - image_size.x * 0.5f), std::floor(content_size.y * 0.5f - image_size.y * 0.5f)); } - window.clear(get_current_theme().background_color); + window.clear(get_theme().background_color); if(error) { window.draw(error_message); @@ -3753,7 +3752,7 @@ namespace QuickMedia { while(current_page == PageType::IMAGES_CONTINUOUS && window.isOpen()) { handle_x11_events(); - window.clear(get_current_theme().background_color); + window.clear(get_theme().background_color); ImageViewerAction action = image_viewer.draw(); switch(action) { case ImageViewerAction::NONE: @@ -3822,12 +3821,12 @@ namespace QuickMedia { const float captcha_slide_padding_x = std::floor(4.0f * get_config().scale); const float captcha_slide_padding_y = std::floor(4.0f * get_config().scale); - sf::Color background_color_darker = get_current_theme().background_color; + sf::Color background_color_darker = get_theme().background_color; background_color_darker.r = std::max(0, (int)background_color_darker.r - 20); background_color_darker.g = std::max(0, (int)background_color_darker.g - 20); background_color_darker.b = std::max(0, (int)background_color_darker.b - 20); RoundedRectangle captcha_slide_bg(sf::Vector2f(1.0f, 1.0f), std::floor(10.0f * get_config().scale), background_color_darker, &rounded_rectangle_shader); - RoundedRectangle captcha_slide_fg(sf::Vector2f(1.0f, 1.0f), std::floor(10.0f * get_config().scale - captcha_slide_padding_y), get_current_theme().loading_bar_color, &rounded_rectangle_shader); + RoundedRectangle captcha_slide_fg(sf::Vector2f(1.0f, 1.0f), std::floor(10.0f * get_config().scale - captcha_slide_padding_y), get_theme().loading_bar_color, &rounded_rectangle_shader); auto attached_image_texture = std::make_unique<sf::Texture>(); sf::Sprite attached_image_sprite; @@ -3934,7 +3933,7 @@ namespace QuickMedia { }; sf::RectangleShape comment_input_shade; - comment_input_shade.setFillColor(get_current_theme().shade_color); + comment_input_shade.setFillColor(get_theme().shade_color); sf::Sprite logo_sprite(plugin_logo); logo_sprite.setScale(0.8f * get_config().scale, 0.8f * get_config().scale); @@ -3953,10 +3952,10 @@ namespace QuickMedia { const float chat_input_padding_y = std::floor(10.0f * get_config().scale); sf::RectangleShape more_items_above_rect; - more_items_above_rect.setFillColor(get_current_theme().more_items_color); + more_items_above_rect.setFillColor(get_theme().more_items_color); sf::RectangleShape more_items_below_rect; - more_items_below_rect.setFillColor(get_current_theme().more_items_color); + more_items_below_rect.setFillColor(get_theme().more_items_color); sf::Vector2f body_pos; sf::Vector2f body_size; @@ -4336,7 +4335,7 @@ namespace QuickMedia { //comment_input.update(); - window.clear(get_current_theme().background_color); + window.clear(get_theme().background_color); if(navigation_stage == NavigationStage::SOLVING_POST_CAPTCHA && captcha_texture.getNativeHandle() != 0) { const float slide_speed = 0.5f; const bool window_has_focus = window.hasFocus(); @@ -4386,7 +4385,7 @@ namespace QuickMedia { // TODO: Cut off ends with sf::View instead sf::RectangleShape cut_off_rectangle(captcha_image_size); - cut_off_rectangle.setFillColor(get_current_theme().background_color); + cut_off_rectangle.setFillColor(get_theme().background_color); cut_off_rectangle.setPosition(captcha_sprite.getPosition() - sf::Vector2f(cut_off_rectangle.getSize().x, 0.0f)); window.draw(cut_off_rectangle); @@ -4426,7 +4425,7 @@ namespace QuickMedia { window.draw(attached_image_sprite); } else { sf::RectangleShape rect(sf::Vector2f(640.0f, 480.0f)); - rect.setFillColor(get_current_theme().image_loading_background_color); + rect.setFillColor(get_theme().image_loading_background_color); auto content_size = window_size; auto rect_size = clamp_to_size(rect.getSize(), content_size); rect.setSize(rect_size); @@ -4494,7 +4493,7 @@ namespace QuickMedia { SearchBar *inputs[num_inputs] = { &login_input, &password_input, &homeserver_input }; int focused_input = 0; - RoundedRectangle background(sf::Vector2f(1.0f, 1.0f), 10.0f, get_current_theme().shade_color, &rounded_rectangle_shader); + RoundedRectangle background(sf::Vector2f(1.0f, 1.0f), 10.0f, get_theme().shade_color, &rounded_rectangle_shader); auto text_submit_callback = [this, inputs](const sf::String&) { for(int i = 0; i < num_inputs; ++i) { @@ -4582,7 +4581,7 @@ namespace QuickMedia { } } - window.clear(get_current_theme().background_color); + window.clear(get_theme().background_color); background.draw(window); for(int i = 0; i < num_inputs; ++i) { inputs[i]->update(); @@ -4646,9 +4645,9 @@ namespace QuickMedia { body_item->embedded_item->embedded_item = nullptr; body_item->embedded_item->reactions.clear(); if(message->user->user_id != my_user_id && ((related_body_item->userdata && static_cast<Message*>(related_body_item->userdata)->user.get() == me) || message_contains_user_mention(body_item->get_description(), my_display_name) || message_contains_user_mention(body_item->get_description(), my_user_id))) - body_item->set_description_color(get_current_theme().attention_alert_text_color); + body_item->set_description_color(get_theme().attention_alert_text_color); else - body_item->set_description_color(get_current_theme().text_color); + body_item->set_description_color(get_theme().text_color); body_item->embedded_item_status = FetchStatus::FINISHED_LOADING; return true; } @@ -4686,12 +4685,12 @@ namespace QuickMedia { body_item->visible = false; if(is_system_message_type(message->type)) { body_item->set_author("Server"); - body_item->set_author_color(get_current_theme().text_color); - body_item->set_description_color(get_current_theme().faded_text_color); + body_item->set_author_color(get_theme().text_color); + body_item->set_description_color(get_theme().faded_text_color); body_item->thumbnail_url.clear(); } if(message->user->user_id != my_user_id && (message_contains_user_mention(body_item->get_description(), my_display_name) || message_contains_user_mention(body_item->get_description(), my_user_id))) - body_item->set_description_color(get_current_theme().attention_alert_text_color); + body_item->set_description_color(get_theme().attention_alert_text_color); return body_item; } @@ -4810,7 +4809,7 @@ namespace QuickMedia { tab.body->show_drop_shadow = false; } - Tabs ui_tabs(&rounded_rectangle_shader, is_touch_enabled() ? sf::Color::Transparent : get_current_theme().background_color); + Tabs ui_tabs(&rounded_rectangle_shader, is_touch_enabled() ? sf::Color::Transparent : get_theme().background_color); const int PINNED_TAB_INDEX = ui_tabs.add_tab("Pinned messages (0)", tabs[0].body.get()); const int MESSAGES_TAB_INDEX = ui_tabs.add_tab("Messages", tabs[1].body.get()); const int USERS_TAB_INDEX = ui_tabs.add_tab("Users (0)", tabs[2].body.get()); @@ -4893,7 +4892,7 @@ namespace QuickMedia { const float room_topic_text_height = std::floor(12.0f * get_config().scale * get_config().font_scale); sf::Text room_topic_text("", *FontLoader::get_font(FontLoader::FontType::LATIN), room_topic_text_height); - room_topic_text.setFillColor(get_current_theme().faded_text_color); + room_topic_text.setFillColor(get_theme().faded_text_color); sf::Text room_label(matrix_chat_page->rooms_page->get_title(), *FontLoader::get_font(FontLoader::FontType::LATIN_BOLD), std::floor(18 * get_config().scale * get_config().font_scale)); room_label.setPosition(15.0f, room_name_text_padding_y + 4.0f); @@ -4923,9 +4922,9 @@ namespace QuickMedia { } body_item->set_description("Message deleted"); if(original_message && is_system_message_type(original_message->type)) - body_item->set_description_color(get_current_theme().faded_text_color); + body_item->set_description_color(get_theme().faded_text_color); else - body_item->set_description_color(get_current_theme().text_color); + body_item->set_description_color(get_theme().text_color); body_item->thumbnail_size = AVATAR_THUMBNAIL_SIZE; body_item->url.clear(); }; @@ -4953,9 +4952,9 @@ namespace QuickMedia { Message *reply_to_message = static_cast<Message*>(body_item->userdata); body_item->set_description(strip(message_get_body_remove_formatting(message.get()))); if(message->user != me && (message_contains_user_mention(reply_to_message->body, my_display_name) || message_contains_user_mention(reply_to_message->body, me->user_id))) - body_item->set_description_color(get_current_theme().attention_alert_text_color); + body_item->set_description_color(get_theme().attention_alert_text_color); else - body_item->set_description_color(get_current_theme().text_color); + body_item->set_description_color(get_theme().text_color); message->replaces = reply_to_message; reply_to_message->replaced_by = message; } @@ -4992,9 +4991,9 @@ namespace QuickMedia { Message *reply_to_message = static_cast<Message*>(body_item->userdata); body_item->set_description(strip(message_get_body_remove_formatting(message.get()))); if(message->user != me && (message_contains_user_mention(reply_to_message->body, my_display_name) || message_contains_user_mention(reply_to_message->body, me->user_id))) - body_item->set_description_color(get_current_theme().attention_alert_text_color); + body_item->set_description_color(get_theme().attention_alert_text_color); else - body_item->set_description_color(get_current_theme().text_color); + body_item->set_description_color(get_theme().text_color); message->replaces = reply_to_message; reply_to_message->replaced_by = message; } @@ -5405,7 +5404,7 @@ namespace QuickMedia { }); } else { auto body_item = message_to_body_item(current_room, message.get(), current_room->get_user_avatar_url(me), me->user_id); - body_item->set_description_color(get_current_theme().provisional_message_color); + body_item->set_description_color(get_theme().provisional_message_color); load_cached_related_embedded_item(body_item.get(), message.get(), me, current_room, tabs[MESSAGES_TAB_INDEX].body->get_items()); tabs[MESSAGES_TAB_INDEX].body->insert_items_by_timestamps({body_item}); post_task_queue.push([this, ¤t_room, text, msgtype, body_item, message]() { @@ -5430,7 +5429,7 @@ namespace QuickMedia { message->related_event_type = RelatedEventType::REPLY; message->related_event_id = static_cast<Message*>(related_to_message)->event_id; auto body_item = message_to_body_item(current_room, message.get(), current_room->get_user_avatar_url(me), me->user_id); - body_item->set_description_color(get_current_theme().provisional_message_color); + body_item->set_description_color(get_theme().provisional_message_color); load_cached_related_embedded_item(body_item.get(), message.get(), me, current_room, tabs[MESSAGES_TAB_INDEX].body->get_items()); tabs[MESSAGES_TAB_INDEX].body->insert_items_by_timestamps({body_item}); post_task_queue.push([this, ¤t_room, text, related_to_message, body_item, message, transaction_id]() { @@ -5456,7 +5455,7 @@ namespace QuickMedia { if(body_item) { auto body_item_shared_ptr = tabs[MESSAGES_TAB_INDEX].body->get_item_by_index(body_item_index); body_item_shared_ptr->set_description(text); - body_item_shared_ptr->set_description_color(get_current_theme().provisional_message_color); + body_item_shared_ptr->set_description_color(get_theme().provisional_message_color); auto edit_body_item = message_to_body_item(current_room, message.get(), current_room->get_user_avatar_url(me), me->user_id); edit_body_item->visible = false; @@ -5550,9 +5549,9 @@ namespace QuickMedia { *body_item = *related_body_item; body_item->reactions.clear(); if(message_contains_user_mention(related_body_item->get_description(), current_room->get_user_display_name(me)) || message_contains_user_mention(related_body_item->get_description(), me->user_id)) - body_item->set_description_color(get_current_theme().attention_alert_text_color); + body_item->set_description_color(get_theme().attention_alert_text_color); else - body_item->set_description_color(get_current_theme().text_color); + body_item->set_description_color(get_theme().text_color); event_data->status = FetchStatus::FINISHED_LOADING; event_data->message = static_cast<Message*>(related_body_item->userdata); body_item->userdata = event_data; @@ -5634,10 +5633,10 @@ namespace QuickMedia { bool has_unread_messages = false; sf::RectangleShape more_messages_below_rect; - more_messages_below_rect.setFillColor(get_current_theme().new_items_alert_color); + more_messages_below_rect.setFillColor(get_theme().new_items_alert_color); sf::RectangleShape chat_input_shade; - chat_input_shade.setFillColor(get_current_theme().shade_color); + chat_input_shade.setFillColor(get_theme().shade_color); float tab_vertical_offset = 0.0f; @@ -6377,11 +6376,11 @@ namespace QuickMedia { if(!provisional_message->event_id.empty()) { provisional_message->message->event_id = std::move(provisional_message->event_id); - provisional_message->body_item->set_description_color(get_current_theme().text_color); + provisional_message->body_item->set_description_color(get_theme().text_color); sent_messages[provisional_message->message->event_id] = std::move(provisional_message.value()); } else if(provisional_message->body_item) { provisional_message->body_item->set_description("Failed to send: " + provisional_message->body_item->get_description()); - provisional_message->body_item->set_description_color(get_current_theme().failed_text_color); + provisional_message->body_item->set_description_color(get_theme().failed_text_color); provisional_message->body_item->userdata = nullptr; } } @@ -6628,7 +6627,7 @@ namespace QuickMedia { fetch_body_item->embedded_item = message_to_body_item(current_room, fetch_message_result.message.get(), current_room->get_user_display_name(me), me->user_id); fetch_body_item->embedded_item_status = FetchStatus::FINISHED_LOADING; if(fetch_message_result.message->user == me) - fetch_body_item->set_description_color(get_current_theme().attention_alert_text_color); + fetch_body_item->set_description_color(get_theme().attention_alert_text_color); } else { fetch_body_item->embedded_item_status = FetchStatus::FAILED_TO_LOAD; } @@ -6638,7 +6637,7 @@ namespace QuickMedia { fetch_message_tab = -1; } - window.clear(get_current_theme().background_color); + window.clear(get_theme().background_color); if(chat_state == ChatState::URL_SELECTION) { url_selection_body.draw(window, body_pos, body_size); @@ -6647,7 +6646,7 @@ namespace QuickMedia { if(selected_tab == MESSAGES_TAB_INDEX && mention.visible && chat_state == ChatState::TYPING_MESSAGE) { sf::RectangleShape user_mention_background(sf::Vector2f(body_size.x, user_mention_body_height)); user_mention_background.setPosition(sf::Vector2f(body_pos.x, body_pos.y + body_size.y - user_mention_body_height)); - user_mention_background.setFillColor(get_current_theme().shade_color); + user_mention_background.setFillColor(get_theme().shade_color); window.draw(user_mention_background); tabs[USERS_TAB_INDEX].body->draw(window, user_mention_background.getPosition(), user_mention_background.getSize()); @@ -6679,7 +6678,7 @@ namespace QuickMedia { if(draw_room_list) { sf::RectangleShape room_list_background(sf::Vector2f(this->body_size.x, window_size.y)); //room_list_background.setPosition(this->body_pos); - room_list_background.setFillColor(get_current_theme().shade_color); + room_list_background.setFillColor(get_theme().shade_color); window.draw(room_list_background); window.draw(room_label); const float tab_y = std::floor(tab_vertical_offset) + room_name_padding_y; @@ -6710,13 +6709,13 @@ namespace QuickMedia { sf::RectangleShape item_background(sf::Vector2f(window_size.x, body_item_size.y + chat_input_height_full + replying_to_text_height + margin)); item_background.setPosition(sf::Vector2f(0.0f, window_size.y - (body_item_size.y + chat_input_height_full + replying_to_text_height + margin))); - item_background.setFillColor(get_current_theme().background_color); + item_background.setFillColor(get_theme().background_color); window.draw(item_background); if(mention.visible) { sf::RectangleShape user_mention_background(sf::Vector2f(window_size.x, user_mention_body_height)); user_mention_background.setPosition(sf::Vector2f(0.0f, item_background.getPosition().y - user_mention_body_height)); - user_mention_background.setFillColor(get_current_theme().shade_color); + user_mention_background.setFillColor(get_theme().shade_color); window.draw(user_mention_background); tabs[USERS_TAB_INDEX].body->draw(window, @@ -6753,9 +6752,9 @@ namespace QuickMedia { room_desc.erase(room_desc.begin() + last_line_start - 1, room_desc.end()); } current_room->body_item->set_description(std::move(room_desc)); - current_room->body_item->set_description_color(get_current_theme().faded_text_color); + current_room->body_item->set_description_color(get_theme().faded_text_color); // TODO: Show a line like nheko instead for unread messages, or something else - current_room->body_item->set_title_color(get_current_theme().text_color); + current_room->body_item->set_title_color(get_theme().text_color); current_room->last_message_read = true; // TODO: Maybe set this instead when the mention is visible on the screen? current_room->unread_notification_count = 0; @@ -6789,7 +6788,7 @@ namespace QuickMedia { // TODO: fetch_messages_dir double progress = 0.5 + std::sin(std::fmod(gradient_inc, 360.0) * 0.017453292519943295 - 1.5707963267948966*0.5) * 0.5; gradient_inc += (frame_time_ms * 0.5); - sf::Color top_color = interpolate_colors(get_current_theme().background_color, get_current_theme().loading_page_color, progress); + sf::Color top_color = interpolate_colors(get_theme().background_color, get_theme().loading_page_color, progress); gradient_points[0].position.x = chat_input_shade.getPosition().x; gradient_points[0].position.y = tab_shade_height; @@ -6805,8 +6804,8 @@ namespace QuickMedia { gradient_points[0].color = top_color; gradient_points[1].color = top_color; - gradient_points[2].color = get_current_theme().background_color; - gradient_points[3].color = get_current_theme().background_color; + gradient_points[2].color = get_theme().background_color; + gradient_points[3].color = get_theme().background_color; if(fetch_messages_dir == MessageDirection::AFTER) { gradient_points[0].position.y = more_messages_below_rect.getPosition().y; @@ -6814,8 +6813,8 @@ namespace QuickMedia { gradient_points[2].position.y = more_messages_below_rect.getPosition().y + gradient_height; gradient_points[3].position.y = more_messages_below_rect.getPosition().y + gradient_height; - gradient_points[0].color = get_current_theme().background_color; - gradient_points[1].color = get_current_theme().background_color; + gradient_points[0].color = get_theme().background_color; + gradient_points[1].color = get_theme().background_color; gradient_points[2].color = top_color; gradient_points[3].color = top_color; } @@ -7190,13 +7189,13 @@ namespace QuickMedia { } idle_active_handler(); - window.clear(get_current_theme().background_color); + window.clear(get_theme().background_color); window.display(); const float loading_bar_padding_x = std::floor(4.0f * get_config().scale); const float loading_bar_padding_y = std::floor(4.0f * get_config().scale); - RoundedRectangle loading_bar_background(sf::Vector2f(1.0f, 1.0f), std::floor(10.0f * get_config().scale), get_current_theme().background_color, &rounded_rectangle_shader); - RoundedRectangle loading_bar(sf::Vector2f(1.0f, 1.0f), std::floor(10.0f * get_config().scale - loading_bar_padding_y), get_current_theme().loading_bar_color, &rounded_rectangle_shader); + RoundedRectangle loading_bar_background(sf::Vector2f(1.0f, 1.0f), std::floor(10.0f * get_config().scale), get_theme().background_color, &rounded_rectangle_shader); + RoundedRectangle loading_bar(sf::Vector2f(1.0f, 1.0f), std::floor(10.0f * get_config().scale - loading_bar_padding_y), get_theme().loading_bar_color, &rounded_rectangle_shader); const float padding_x = std::floor(30.0f * get_config().scale); const float spacing_y = std::floor(15.0f * get_config().scale); @@ -7205,9 +7204,9 @@ namespace QuickMedia { sf::Text progress_text("0kb/Unknown", *FontLoader::get_font(FontLoader::FontType::LATIN), std::floor(20.0f * get_config().scale * get_config().font_scale)); sf::Text status_text("Downloading", *FontLoader::get_font(FontLoader::FontType::LATIN), std::floor(20.0f * get_config().scale * get_config().font_scale)); sf::Text filename_text(filename.c_str(), *FontLoader::get_font(FontLoader::FontType::LATIN), std::floor(14.0f * get_config().scale * get_config().font_scale)); - filename_text.setFillColor(get_current_theme().faded_text_color); + filename_text.setFillColor(get_theme().faded_text_color); sf::Text download_speed_text("0 bytes/s", *FontLoader::get_font(FontLoader::FontType::LATIN), std::floor(14.0f * get_config().scale * get_config().font_scale)); - download_speed_text.setFillColor(get_current_theme().faded_text_color); + download_speed_text.setFillColor(get_theme().faded_text_color); bool redraw = true; sf::Event event; @@ -7313,7 +7312,7 @@ namespace QuickMedia { std::floor((loading_bar_background.get_size().x - loading_bar_padding_x * 2.0f) * ui_progress), loading_bar_height - loading_bar_padding_y * 2.0f)); - window.clear(get_current_theme().shade_color); + window.clear(get_theme().shade_color); loading_bar_background.draw(window); loading_bar.draw(window); window.draw(progress_text); @@ -7389,10 +7388,10 @@ namespace QuickMedia { const float bottom_panel_spacing = 10.0f; Button cancel_button("Cancel", FontLoader::get_font(FontLoader::FontType::LATIN), 16, 100.0f, &rounded_rectangle_shader, get_config().scale * get_config().font_scale); - cancel_button.set_background_color(get_current_theme().cancel_button_background_color); + cancel_button.set_background_color(get_theme().cancel_button_background_color); Button save_button("Save", FontLoader::get_font(FontLoader::FontType::LATIN), 16, 100.0f, &rounded_rectangle_shader, get_config().scale * get_config().font_scale); - save_button.set_background_color(get_current_theme().confirm_button_background_color); + save_button.set_background_color(get_theme().confirm_button_background_color); sf::Text file_name_label("File name:", *FontLoader::get_font(FontLoader::FontType::LATIN), std::floor(16.0f * get_config().scale * get_config().font_scale)); @@ -7402,7 +7401,7 @@ namespace QuickMedia { file_name_entry.set_editable(false); sf::RectangleShape bottom_panel_background; - bottom_panel_background.setFillColor(get_current_theme().shade_color); + bottom_panel_background.setFillColor(get_theme().shade_color); const float gradient_height = 5.0f; sf::Vertex gradient_points[4]; @@ -7517,7 +7516,7 @@ namespace QuickMedia { gradient_points[3] = sf::Vertex(bottom_panel_background.getPosition() + sf::Vector2f(0.0f, 0.0f), color); } - window.clear(get_current_theme().background_color); + window.clear(get_theme().background_color); ui_tabs.draw(window, sf::Vector2f(0.0f, search_bar->getBottomWithoutShadow()), window_size.x); search_bar->draw(window, window_size, true); |