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

more small fixes

Browse Source
This commit is contained in:
Green Sky 2024-01-12 19:04:50 +01:00
parent 7fa6aa7ac2
commit 78b0e9a77f
No known key found for this signature in database
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/solanaceae_tox vendored

@ -1 +1 @@
Subproject commit 75ed1dffebe254d9cc79753d31f4c73c40238f72 Subproject commit ce760a800c6765009c4f49211b0a61c71756bfc0

12
src/chat_gui4.cpp
View File

@ -370,7 +370,7 @@ void ChatGui4::render(float time_delta) {
// wrongly assumes contacts never get removed from a group // wrongly assumes contacts never get removed from a group
if (sub_contacts != nullptr && list.size() < sub_contacts->size()) { if (sub_contacts != nullptr && list.size() < sub_contacts->size()) {
// if partically delivered // if partically delivered
ImGui::TextColored(ImVec4{0.7f, 0.7f, 0.1f, 0.7f}, "d"); ImGui::TextColored(ImVec4{0.8f, 0.8f, 0.1f, 0.7f}, "d");
} else { } else {
// if fully delivered // if fully delivered
ImGui::TextColored(ImVec4{0.1f, 0.8f, 0.1f, 0.7f}, "D"); ImGui::TextColored(ImVec4{0.1f, 0.8f, 0.1f, 0.7f}, "D");
@ -382,9 +382,10 @@ void ChatGui4::render(float time_delta) {
for (const auto& [c, syned_ts] : list) { for (const auto& [c, syned_ts] : list) {
if (_cr.all_of<Contact::Components::TagSelfStrong>(c)) { if (_cr.all_of<Contact::Components::TagSelfStrong>(c)) {
synced_by_text += "\n sself(!)"; // makes no sense //synced_by_text += "\n sself(!)"; // makes no sense
continue;
} else if (_cr.all_of<Contact::Components::TagSelfWeak>(c)) { } else if (_cr.all_of<Contact::Components::TagSelfWeak>(c)) {
synced_by_text += "\n wself"; synced_by_text += "\n wself"; // TODO: add name?
} else { } else {
synced_by_text += "\n >" + (_cr.all_of<Contact::Components::Name>(c) ? _cr.get<Contact::Components::Name>(c).name : "<unk>"); synced_by_text += "\n >" + (_cr.all_of<Contact::Components::Name>(c) ? _cr.get<Contact::Components::Name>(c).name : "<unk>");
} }
@ -408,7 +409,7 @@ void ChatGui4::render(float time_delta) {
// wrongly assumes contacts never get removed from a group // wrongly assumes contacts never get removed from a group
if (sub_contacts != nullptr && list.size() < sub_contacts->size()) { if (sub_contacts != nullptr && list.size() < sub_contacts->size()) {
// if partially read // if partially read
ImGui::TextColored(ImVec4{0.7f, 0.7f, 0.1f, 0.7f}, "r"); ImGui::TextColored(ImVec4{0.8f, 0.8f, 0.1f, 0.7f}, "r");
} else { } else {
// if fully read // if fully read
ImGui::TextColored(ImVec4{0.1f, 0.8f, 0.1f, 0.7f}, "R"); ImGui::TextColored(ImVec4{0.1f, 0.8f, 0.1f, 0.7f}, "R");
@ -420,7 +421,8 @@ void ChatGui4::render(float time_delta) {
for (const auto& [c, syned_ts] : list) { for (const auto& [c, syned_ts] : list) {
if (_cr.all_of<Contact::Components::TagSelfStrong>(c)) { if (_cr.all_of<Contact::Components::TagSelfStrong>(c)) {
synced_by_text += "\n sself(!)"; // makes no sense //synced_by_text += "\n sself(!)"; // makes no sense
continue;
} else if (_cr.all_of<Contact::Components::TagSelfWeak>(c)) { } else if (_cr.all_of<Contact::Components::TagSelfWeak>(c)) {
synced_by_text += "\n wself"; synced_by_text += "\n wself";
} else { } else {