Green-Sky/tomato
Green-Sky/tomato
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

move icon out of avatar, use for small list

Browse Source
This commit is contained in:
Green Sky 2024-04-22 12:46:01 +02:00
parent 5ac318d1bf
commit 4b0d9595ac
No known key found for this signature in database
2 changed files with 57 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/chat_gui/contact_list.cpp
View File

@ -46,6 +46,8 @@ static void drawIconDirect(
const ImU32 col_back const ImU32 col_back
) { ) {
// dark background // dark background
// the circle looks bad in light mode
//ImGui::GetWindowDrawList()->AddCircleFilled({p0.x + p1_o.x*0.5f, p0.y + p1_o.y*0.5f}, p1_o.x*0.5f, col_back);
drawIconDirectLines(p0, p1_o, col_back, 4.0f); drawIconDirectLines(p0, p1_o, col_back, 4.0f);
drawIconDirectLines(p0, p1_o, col_main, 1.5f); drawIconDirectLines(p0, p1_o, col_main, 1.5f);
} }
@ -78,8 +80,11 @@ static void drawIconCloud(
{0.2f, 0.9f}, {0.2f, 0.9f},
}}; }};
for (auto& v : points) { for (auto& v : points) {
v.y -= 0.1f;
v = {p0.x + p1_o.x*v.x, p0.y + p1_o.y*v.y}; v = {p0.x + p1_o.x*v.x, p0.y + p1_o.y*v.y};
} }
// the circle looks bad in light mode
//ImGui::GetWindowDrawList()->AddCircleFilled({p0.x + p1_o.x*0.5f, p0.y + p1_o.y*0.5f}, p1_o.x*0.5f, col_back);
ImGui::GetWindowDrawList()->AddPolyline(points.data(), points.size(), col_back, ImDrawFlags_None, 4.f); ImGui::GetWindowDrawList()->AddPolyline(points.data(), points.size(), col_back, ImDrawFlags_None, 4.f);
ImGui::GetWindowDrawList()->AddPolyline(points.data(), points.size(), col_main, ImDrawFlags_None, 1.5f); ImGui::GetWindowDrawList()->AddPolyline(points.data(), points.size(), col_main, ImDrawFlags_None, 1.5f);
} }
@ -194,45 +199,39 @@ bool renderContactBig(
orig_curser_pos.y + ImGui::GetStyle().FramePadding.y orig_curser_pos.y + ImGui::GetStyle().FramePadding.y
}; };
float img_y { float img_y {TEXT_BASE_HEIGHT*line_height - ImGui::GetStyle().FramePadding.y*2};
//(post_curser_pos.y - orig_curser_pos.y) - ImGui::GetStyle().FramePadding.y*2
TEXT_BASE_HEIGHT*line_height - ImGui::GetStyle().FramePadding.y*2
};
ImGui::SetCursorPos(img_curser); ImGui::SetCursorPos(img_curser);
{ // avatar stuff renderAvatar(th, contact_tc, c, {img_y, img_y});
// icon pos
auto p0 = ImGui::GetCursorScreenPos();
p0.x += img_y * 0.5f;
p0.y += img_y * 0.5f;
ImVec2 p1_o = {img_y, img_y};;
p1_o.x *= 0.5f;
p1_o.y *= 0.5f;
renderAvatar(th, contact_tc, c, {img_y, img_y});
if (cstate != nullptr) {
if (cstate->state == Contact::Components::ConnectionState::direct) { // direct icon
const ImU32 col_back = ImGui::GetColorU32({0.0f, 0.0f, 0.0f, 0.8f});
const ImU32 col_main = ImGui::GetColorU32({0.1f, 1.f, 0.1f, 1.0f});
drawIconDirect(p0, p1_o, col_main, col_back);
} else if (cstate->state == Contact::Components::ConnectionState::cloud) { // cloud icon
const ImU32 col_back = ImGui::GetColorU32({0.0f, 0.0f, 0.0f, 0.8f});
const ImU32 col_main = ImGui::GetColorU32({0.5f, 1.f, 0.1f, 1.0f});
drawIconCloud(p0, p1_o, col_main, col_back);
}
}
}
ImGui::SameLine(); ImGui::SameLine();
ImGui::BeginGroup(); ImGui::BeginGroup();
{ {
// line 1 { // line 1
ImGui::Text("%s%s", unread?"* ":"", (c.all_of<Contact::Components::Name>() ? c.get<Contact::Components::Name>().name.c_str() : "<unk>")); if (line_height == 1 && cstate != nullptr) {
// icon pos
auto p0 = ImGui::GetCursorScreenPos();
p0.y += ImGui::GetStyle().FramePadding.y;
ImVec2 p1_o = {img_y, img_y}; // img_y is 1 line_height in this case
if (cstate->state == Contact::Components::ConnectionState::direct) { // direct icon
const ImU32 col_back = ImGui::GetColorU32({0.0f, 0.0f, 0.0f, 0.4f});
const ImU32 col_main = ImGui::GetColorU32({0.0f, 1.f, 0.0f, 1.0f});
drawIconDirect(p0, p1_o, col_main, col_back);
} else if (cstate->state == Contact::Components::ConnectionState::cloud) { // cloud icon
const ImU32 col_back = ImGui::GetColorU32({0.0f, 0.0f, 0.0f, 0.4f});
const ImU32 col_main = ImGui::GetColorU32({0.0f, 1.f, 0.0f, 1.0f});
drawIconCloud(p0, p1_o, col_main, col_back);
}
ImGui::Dummy(p1_o);
ImGui::SameLine();
}
ImGui::Text("%s%s", unread?"* ":"", (c.all_of<Contact::Components::Name>() ? c.get<Contact::Components::Name>().name.c_str() : "<unk>"));
}
// line 2 // line 2
if (line_height >= 2) { if (line_height >= 2) {
@ -241,6 +240,28 @@ bool renderContactBig(
} else if (request_outgoing) { } else if (request_outgoing) {
ImGui::TextUnformatted("Outgoing request/invite"); ImGui::TextUnformatted("Outgoing request/invite");
} else { } else {
if (cstate != nullptr) {
// icon pos
auto p0 = ImGui::GetCursorScreenPos();
p0.y += ImGui::GetStyle().FramePadding.y;
const float box_hight = TEXT_BASE_HEIGHT - ImGui::GetStyle().FramePadding.y*2;
ImVec2 p1_o = {box_hight, box_hight};
if (cstate->state == Contact::Components::ConnectionState::direct) { // direct icon
const ImU32 col_back = ImGui::GetColorU32({0.0f, 0.0f, 0.0f, 0.4f});
const ImU32 col_main = ImGui::GetColorU32({0.0f, 1.f, 0.0f, 1.0f});
drawIconDirect(p0, p1_o, col_main, col_back);
} else if (cstate->state == Contact::Components::ConnectionState::cloud) { // cloud icon
const ImU32 col_back = ImGui::GetColorU32({0.0f, 0.0f, 0.0f, 0.4f});
const ImU32 col_main = ImGui::GetColorU32({0.0f, 1.f, 0.0f, 1.0f});
drawIconCloud(p0, p1_o, col_main, col_back);
}
ImGui::Dummy(p1_o);
ImGui::SameLine();
}
ImGui::TextDisabled("status message..."); ImGui::TextDisabled("status message...");
} }

7
src/chat_gui4.cpp
View File

@ -227,12 +227,13 @@ float ChatGui4::render(float time_delta) {
if (sub_contacts != nullptr && !_cr.all_of<Contact::Components::TagPrivate>(*_selected_contact) && _cr.all_of<Contact::Components::TagGroup>(*_selected_contact)) { if (sub_contacts != nullptr && !_cr.all_of<Contact::Components::TagPrivate>(*_selected_contact) && _cr.all_of<Contact::Components::TagGroup>(*_selected_contact)) {
if (!sub_contacts->empty()) { if (!sub_contacts->empty()) {
if (ImGui::BeginChild("subcontacts", {150, -100}, true)) { if (ImGui::BeginChild("subcontacts", {175, -100}, true)) {
ImGui::Text("subs: %zu", sub_contacts->size()); ImGui::Text("subs: %zu", sub_contacts->size());
ImGui::Separator(); ImGui::Separator();
for (const auto& c : *sub_contacts) { for (const auto& c : *sub_contacts) {
// TODO: can a sub be selected? no // TODO: can a sub be selected? no
if (renderSubContactListContact(c, _selected_contact.has_value() && *_selected_contact == c)) { //if (renderSubContactListContact(c, _selected_contact.has_value() && *_selected_contact == c)) {
if (renderContactBig(_theme, _contact_tc, {_cr, c}, 1)) {
_text_input_buffer.insert(0, (_cr.all_of<Contact::Components::Name>(c) ? _cr.get<Contact::Components::Name>(c).name : "<unk>") + ": "); _text_input_buffer.insert(0, (_cr.all_of<Contact::Components::Name>(c) ? _cr.get<Contact::Components::Name>(c).name : "<unk>") + ": ");
} }
} }
@ -325,7 +326,7 @@ float ChatGui4::render(float time_delta) {
msg_reg.view<Components::UnreadFade>().each([&to_remove, time_delta](const Message3 e, Components::UnreadFade& fade) { msg_reg.view<Components::UnreadFade>().each([&to_remove, time_delta](const Message3 e, Components::UnreadFade& fade) {
// TODO: configurable // TODO: configurable
const float fade_duration = 7.5f; const float fade_duration = 7.5f;
fade.fade -= 1.f/fade_duration * std::min<float>(time_delta, 1.f/10.f); // fps but not below 10 for smooth fade fade.fade -= 1.f/fade_duration * std::min<float>(time_delta, 1.f/8.f); // fps but not below 8 for smooth-ish fade
if (fade.fade <= 0.f) { if (fade.fade <= 0.f) {
to_remove.push_back(e); to_remove.push_back(e);
} }