From 6dca4f499ef53f25667c0fb495b5e3bec639cf36 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Sat, 12 Feb 2022 20:51:31 +0100
Subject: [PATCH] Fix call participant widget

---
 main/data/theme.css                           | 28 +++----------------
 .../ui/call_window/participant_widget.vala    |  5 ++--
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/main/data/theme.css b/main/data/theme.css
index 2451f5d9..3e076248 100644
--- a/main/data/theme.css
+++ b/main/data/theme.css
@@ -309,30 +309,6 @@ box.dino-input-error label.input-status-highlight-once {
     margin: 0;
 }
 
-.dino-call-window .black-element {
-    color: rgba(255,255,255,0.7);
-    border-radius: 5px;
-    background: rgba(0,0,0,0.5);
-    border: none;
-    box-shadow: none;
-}
-
-.dino-call-window label.black-element {
-    padding: 5px;
-}
-
-.dino-call-window button.black-element {
-    padding: 0;
-}
-
-.dino-call-window button.black-element.unencrypted {
-    color: @error_color;
-}
-
-.dino-call-window .black-element:hover {
-    background: rgba(20,20,20,0.5);
-}
-
 .dino-call-window .participant-header-bar {
     background: none;
     border: none;
@@ -366,6 +342,10 @@ box.dino-input-error label.input-status-highlight-once {
     color: white;
 }
 
+.dino-call-window .participant-header-bar button.unencrypted image {
+    color: @error_color;
+}
+
 .dino-call-window .call-bottom-bar {
     background: linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.3));
     border: 0;
diff --git a/main/src/ui/call_window/participant_widget.vala b/main/src/ui/call_window/participant_widget.vala
index 1f6be68d..f18ae242 100644
--- a/main/src/ui/call_window/participant_widget.vala
+++ b/main/src/ui/call_window/participant_widget.vala
@@ -13,7 +13,7 @@ namespace Dino.Ui {
         public Box inner_box = new Box(Orientation.HORIZONTAL, 0) { margin_start=5, margin_top=5, hexpand=true, visible=true };
         public Box title_box = new Box(Orientation.VERTICAL, 0) { valign=Align.CENTER, hexpand=true, visible=true };
         public CallEncryptionButton encryption_button = new CallEncryptionButton() { opacity=0, relief=ReliefStyle.NONE, height_request=30, width_request=30, margin_end=5, visible=true };
-        public MenuButton menu_button = new MenuButton() { relief=ReliefStyle.NONE, visible=true, image=new Image.from_icon_name("open-menu-symbolic", IconSize.MENU) };
+        public MenuButton menu_button = new MenuButton() { relief=ReliefStyle.NONE, visible=true };
         public Button invite_button = new Button.from_icon_name("dino-account-plus") { relief=ReliefStyle.NONE, visible=true };
         public bool shows_video = false;
         public string? participant_name;
@@ -34,7 +34,8 @@ namespace Dino.Ui {
             header_bar.pack_start(encryption_button);
             header_bar.pack_end(menu_button);
 
-            menu_button.popover = create_menu();
+            menu_button.image = new Image.from_icon_name("open-menu-symbolic", IconSize.MENU);
+            menu_button.set_popover(create_menu());
             invite_button.clicked.connect(() => invite_button_clicked());
 
             this.add_overlay(header_bar);