Tha_14/tomato-testing
1
0
Fork 0
forked from Green-Sky/tomato
Code Pull Requests Actions Packages Releases Activity

update to entt 3.12.2

Browse Source
This commit is contained in:
Green Sky 2023-10-02 15:40:32 +02:00
parent 2f8eca71a4
commit da774e10e8
No known key found for this signature in database
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/chat_gui4.cpp
View File

@ -197,9 +197,9 @@ void ChatGui4::render(void) {
msg_reg.remove<Components::UnreadFade>(to_remove.cbegin(), to_remove.cend()); msg_reg.remove<Components::UnreadFade>(to_remove.cbegin(), to_remove.cend());
} }
msg_reg.view<Message::Components::ContactFrom, Message::Components::ContactTo, Message::Components::Timestamp>() auto tmp_view = msg_reg.view<Message::Components::ContactFrom, Message::Components::ContactTo, Message::Components::Timestamp>();
.use<Message::Components::Timestamp>() tmp_view.use<Message::Components::Timestamp>();
.each([&](const Message3 e, Message::Components::ContactFrom& c_from, Message::Components::ContactTo& c_to, Message::Components::Timestamp ts tmp_view.each([&](const Message3 e, Message::Components::ContactFrom& c_from, Message::Components::ContactTo& c_to, Message::Components::Timestamp ts
) { ) {
// TODO: why? // TODO: why?
ImGui::TableNextRow(0, TEXT_BASE_HEIGHT); ImGui::TableNextRow(0, TEXT_BASE_HEIGHT);
@ -651,9 +651,11 @@ bool ChatGui4::renderContactListContactBig(const Contact3 c, const bool selected
// TODO: is there a better way? // TODO: is there a better way?
// maybe cache mm? // maybe cache mm?
bool has_unread = false; bool has_unread = false;
if (const auto* mm = _rmm.get(c); mm != nullptr && !mm->storage<Message::Components::TagUnread>().empty()) { if (const auto* mm = _rmm.get(c); mm != nullptr) {
if (const auto* unread_storage = mm->storage<Message::Components::TagUnread>(); unread_storage != nullptr && !unread_storage->empty()) {
has_unread = true; has_unread = true;
} }
}
ImGui::Text("%s%s", has_unread?"* ":"", (_cr.all_of<Contact::Components::Name>(c) ? _cr.get<Contact::Components::Name>(c).name.c_str() : "<unk>")); ImGui::Text("%s%s", has_unread?"* ":"", (_cr.all_of<Contact::Components::Name>(c) ? _cr.get<Contact::Components::Name>(c).name.c_str() : "<unk>"));
if (request_incoming) { if (request_incoming) {