diff options
| author | fiaxh <git@lightrise.org> | 2022-02-12 14:07:19 +0100 |
|---|---|---|
| committer | fiaxh <git@lightrise.org> | 2022-02-12 14:22:29 +0100 |
| commit | be751a5dda6e4b4612276d278f59f9f96ed0298c (patch) | |
| tree | 3f0aeca430893c4ebf1fe51ab1102537a5681ca2 /main | |
| parent | 6532c2b160c66540091d667c4af116ec4d71ff43 (diff) | |
| download | dino-be751a5dda6e4b4612276d278f59f9f96ed0298c.tar.gz dino-be751a5dda6e4b4612276d278f59f9f96ed0298c.zip | |
Various call fixes
- If peer invited us claiming audio-only and then wants to have a video content, do a content-modify and accept audio-only
- Check contents for video (and modify) and whether call is truly accepted in PeerState.accept() directly
- If a message contains both JMI and CIM, only use JMI
- Fix outgoing CIM (disabled)
- Use opacity instead of visiblity for file_menu, small fixes
- Add back owner/admin/member queries when joining MUC (regression from 33104a7)
Diffstat (limited to 'main')
| -rw-r--r-- | main/data/file_default_widget.ui | 3 | ||||
| -rw-r--r-- | main/src/ui/conversation_content_view/file_default_widget.vala | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/main/data/file_default_widget.ui b/main/data/file_default_widget.ui index 7da52ec2..6315e230 100644 --- a/main/data/file_default_widget.ui +++ b/main/data/file_default_widget.ui @@ -90,7 +90,8 @@ </child> <child> <object class="GtkMenuButton" id="file_menu"> - <property name="visible">False</property> + <property name="visible">True</property> + <property name="opacity">0</property> <property name="relief">none</property> <child> <object class="GtkImage"> diff --git a/main/src/ui/conversation_content_view/file_default_widget.vala b/main/src/ui/conversation_content_view/file_default_widget.vala index dc952b30..28b7d477 100644 --- a/main/src/ui/conversation_content_view/file_default_widget.vala +++ b/main/src/ui/conversation_content_view/file_default_widget.vala @@ -85,7 +85,7 @@ public class FileDefaultWidget : EventBox { image_stack.set_visible_child_name("download_image"); } if (state == FileTransfer.State.COMPLETE) { - file_menu.visible = true; + file_menu.opacity = 1; } return false; } @@ -104,7 +104,7 @@ public class FileDefaultWidget : EventBox { if (state == FileTransfer.State.NOT_STARTED) { image_stack.set_visible_child_name("content_type_image"); } - file_menu.visible = false; + file_menu.opacity = 0; } private static string get_file_icon_name(string? mime_type) { |