Compare commits
3 Commits
07070dd2d4
...
dev-ab1c6c
Author | SHA1 | Date | |
---|---|---|---|
ab1c6c4749 | |||
06d7148408 | |||
33875cb58b |
6
external/toxcore/CMakeLists.txt
vendored
6
external/toxcore/CMakeLists.txt
vendored
@ -12,7 +12,11 @@ add_subdirectory(./c-toxcore)
|
|||||||
# the sad case
|
# the sad case
|
||||||
add_library(toxcore INTERFACE)
|
add_library(toxcore INTERFACE)
|
||||||
|
|
||||||
target_link_libraries(toxcore INTERFACE toxcore_static)
|
if (TARGET toxcore_static)
|
||||||
|
target_link_libraries(toxcore INTERFACE toxcore_static)
|
||||||
|
else()
|
||||||
|
target_link_libraries(toxcore INTERFACE toxcore_shared)
|
||||||
|
endif()
|
||||||
|
|
||||||
# HACK: "install" api headers into binary dir
|
# HACK: "install" api headers into binary dir
|
||||||
configure_file(
|
configure_file(
|
||||||
|
@ -293,7 +293,7 @@ bool renderContactBig(
|
|||||||
ImGui::TextUnformatted(slt->text.c_str(), slt->text.c_str() + slt->first_line_length);
|
ImGui::TextUnformatted(slt->text.c_str(), slt->text.c_str() + slt->first_line_length);
|
||||||
ImGui::PopStyleColor();
|
ImGui::PopStyleColor();
|
||||||
} else {
|
} else {
|
||||||
ImGui::TextDisabled(""); // or dummy?
|
ImGui::TextDisabled(" "); // or dummy?
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -871,10 +871,15 @@ void ChatGui4::renderMessageBodyFile(Message3Registry& reg, const Message3 e) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (ImGui::BeginPopup("forward to contact")) {
|
if (ImGui::BeginPopup("forward to contact")) {
|
||||||
// TODO: make exclusion work
|
|
||||||
//for (const auto& c : _cr.view<entt::get_t<Contact::Components::TagBig>, entt::exclude_t<Contact::Components::RequestIncoming, Contact::Components::TagRequestOutgoing>>()) {
|
|
||||||
for (const auto& c : _cr.view<Contact::Components::TagBig>()) {
|
for (const auto& c : _cr.view<Contact::Components::TagBig>()) {
|
||||||
if (renderContactListContactSmall(c, false)) {
|
// filter
|
||||||
|
if (_cr.any_of<Contact::Components::RequestIncoming, Contact::Components::TagRequestOutgoing>(c)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// TODO: check for contact capability
|
||||||
|
|
||||||
|
if (renderContactBig(_theme, _contact_tc, {_cr, c}, 1, false, true, false)) {
|
||||||
|
//if (renderContactListContactSmall(c, false)) {
|
||||||
//_rmm.sendFilePath(*_selected_contact, path.filename().generic_u8string(), path.generic_u8string());
|
//_rmm.sendFilePath(*_selected_contact, path.filename().generic_u8string(), path.generic_u8string());
|
||||||
const auto& fil = reg.get<Message::Components::Transfer::FileInfoLocal>(e);
|
const auto& fil = reg.get<Message::Components::Transfer::FileInfoLocal>(e);
|
||||||
for (const auto& path : fil.file_list) {
|
for (const auto& path : fil.file_list) {
|
||||||
|
Reference in New Issue
Block a user