From 3b0d367c6b70f88e5fa01a1813f9487c37401050 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Wed, 28 Apr 2021 18:46:15 +0200 Subject: Update emoji, add room topic to matrix --- src/QuickMedia.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/QuickMedia.cpp') diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index 54308a4..842ecbe 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -3684,12 +3684,16 @@ namespace QuickMedia { logo_sprite.setScale(0.8f * get_ui_scale(), 0.8f * get_ui_scale()); sf::Vector2f logo_size(plugin_logo.getSize().x * logo_sprite.getScale().x, plugin_logo.getSize().y * logo_sprite.getScale().y); - sf::Text room_name_text("", *FontLoader::get_font(FontLoader::FontType::LATIN_BOLD), std::floor(18 * get_ui_scale())); const float room_name_text_height = std::floor(18.0f * get_ui_scale()); + sf::Text room_name_text("", *FontLoader::get_font(FontLoader::FontType::LATIN_BOLD), room_name_text_height); const float room_name_text_padding_y = std::floor(10.0f * get_ui_scale()); const float room_name_total_height = room_name_text_height + room_name_text_padding_y * 2.0f; const float room_avatar_height = 32.0f; + const float room_topic_text_height = std::floor(12.0f * get_ui_scale()); + sf::Text room_topic_text("", *FontLoader::get_font(FontLoader::FontType::LATIN), room_topic_text_height); + room_topic_text.setFillColor(sf::Color(179, 179, 179)); + sf::Text room_label(room_tabs[room_selected_tab].page->get_title(), *FontLoader::get_font(FontLoader::FontType::LATIN_BOLD), std::floor(18 * get_ui_scale())); room_label.setPosition(15.0f, room_name_text_padding_y + 4.0f); @@ -3913,7 +3917,8 @@ namespace QuickMedia { process_pinned_events(std::move(pinned_events)); tabs[PINNED_TAB_INDEX].body->select_last_item(); - room_name_text.setString(current_room->body_item->get_title()); + room_name_text.setString(current_room->get_name()); + room_topic_text.setString(current_room->get_topic()); room_avatar_thumbnail_data = std::make_shared(); read_marker_timeout_ms = 0; @@ -5135,8 +5140,12 @@ namespace QuickMedia { window.draw(room_avatar_sprite, &circle_mask_shader); room_name_text_offset_x += room_avatar_texture_size.x + 10.0f; } - room_name_text.setPosition(body_pos.x + room_name_text_offset_x, room_name_text_padding_y + 4.0f); + + room_name_text.setPosition(body_pos.x + room_name_text_offset_x, room_name_text_padding_y); window.draw(room_name_text); + + room_topic_text.setPosition(room_name_text.getPosition().x + room_name_text.getLocalBounds().width + 15.0f, room_name_text_padding_y + 2.0f + room_name_text_height * 0.5f - room_topic_text_height * 0.5f); + window.draw(room_topic_text); } if(draw_room_list) { -- cgit v1.2.3