From e10af24d9db882b1c237895cbea61720d04d97cb Mon Sep 17 00:00:00 2001 From: dec05eba Date: Mon, 8 Feb 2021 23:00:13 +0100 Subject: Matrix: always show room list selection, make wider --- include/Body.hpp | 1 - src/Body.cpp | 2 +- src/QuickMedia.cpp | 4 +--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/Body.hpp b/include/Body.hpp index ee83dae..676eef8 100644 --- a/include/Body.hpp +++ b/include/Body.hpp @@ -252,7 +252,6 @@ namespace QuickMedia { BodyItemRenderCallback body_item_render_callback; sf::Shader *thumbnail_mask_shader; AttachSide attach_side = AttachSide::TOP; - bool render_selection = true; 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, bool include_embedded_item = true); void update_dirty_state(BodyItem *body_item, float width); diff --git a/src/Body.cpp b/src/Body.cpp index 8abd2b3..88bada4 100644 --- a/src/Body.cpp +++ b/src/Body.cpp @@ -706,7 +706,7 @@ namespace QuickMedia { item_separator.setPosition(item_pos + sf::Vector2f(10.0f, std::floor(item_height + spacing_y * 0.5f))); window.draw(item_separator); - if(item_index == selected_item && render_selection) { + if(item_index == selected_item) { item_background.setPosition(item_pos); item_background.setSize(sf::Vector2f(size.x, item_height)); window.draw(item_background); diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index 7e487d1..ec33b3e 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -1118,7 +1118,6 @@ namespace QuickMedia { break; current_chat_room = matrix->get_room_by_id(selected_item->url); } - tabs[selected_tab].body->render_selection = true; //select_body_item_by_room(tabs[selected_tab].body.get(), current_chat_room); current_chat_room = nullptr; } else { @@ -4489,7 +4488,7 @@ namespace QuickMedia { this->body_pos = sf::Vector2f(0.0f, body_padding_vertical + tab_shade_height); if(body_width > 640.0f) { - this->body_size = sf::Vector2f(250.0f, window_size.y - body_padding_vertical - tab_shade_height); + this->body_size = sf::Vector2f(300.0f, window_size.y - body_padding_vertical - tab_shade_height); draw_room_list = true; } else { this->body_size = sf::Vector2f(0.0f, 0.0f); @@ -4610,7 +4609,6 @@ namespace QuickMedia { window.clear(back_color); - room_tabs[room_selected_tab].body->render_selection = sf::Keyboard::isKeyPressed(sf::Keyboard::LAlt) && (chat_state == ChatState::NAVIGATING || chat_state == ChatState::URL_SELECTION); if(draw_room_list) { sf::RectangleShape room_list_background(this->body_size); room_list_background.setPosition(this->body_pos); -- cgit v1.2.3