aboutsummaryrefslogtreecommitdiff
path: root/main/src
diff options
context:
space:
mode:
authorMarvin W <git@larma.de>2022-08-21 00:57:03 +0200
committerMarvin W <git@larma.de>2022-08-21 00:57:46 +0200
commitd6afa6e8ff4cfb533140d9434b83f18f627f11ca (patch)
tree94f99ac111c84591e1478be23748a28bcc37d727 /main/src
parent7b252d040a845b7e9c515f61927fbf5bf7ed4c3a (diff)
downloaddino-d6afa6e8ff4cfb533140d9434b83f18f627f11ca.tar.gz
dino-d6afa6e8ff4cfb533140d9434b83f18f627f11ca.zip
GTK4: Don't require use of MenuButton.set_child introduced with 4.6
Diffstat (limited to 'main/src')
-rw-r--r--main/src/ui/call_window/call_bottom_bar.vala19
1 files changed, 17 insertions, 2 deletions
diff --git a/main/src/ui/call_window/call_bottom_bar.vala b/main/src/ui/call_window/call_bottom_bar.vala
index c30a86e9..aa318a45 100644
--- a/main/src/ui/call_window/call_bottom_bar.vala
+++ b/main/src/ui/call_window/call_bottom_bar.vala
@@ -37,7 +37,7 @@ public class Dino.Ui.CallBottomBar : Gtk.Box {
audio_button.margin_end = audio_button.margin_bottom = 5; // space for the small settings button
audio_button_overlay.set_child(audio_button);
audio_button_overlay.add_overlay(audio_settings_button);
- audio_settings_button.set_child(new Image.from_icon_name("go-up-symbolic") { pixel_size=10 });
+ menu_button_set_icon_with_size(audio_settings_button, "go-up-symbolic", 10);
audio_settings_button.add_css_class("call-mediadevice-settings-button");
main_buttons.append(audio_button_overlay);
@@ -47,7 +47,7 @@ public class Dino.Ui.CallBottomBar : Gtk.Box {
video_button.margin_end = video_button.margin_bottom = 5;
video_button_overlay.set_child(video_button);
video_button_overlay.add_overlay(video_settings_button);
- video_settings_button.set_child(new Image.from_icon_name("go-up-symbolic") { pixel_size=10 });
+ menu_button_set_icon_with_size(video_settings_button, "go-up-symbolic", 10);
video_settings_button.add_css_class("call-mediadevice-settings-button");
main_buttons.append(video_button_overlay);
@@ -76,6 +76,21 @@ public class Dino.Ui.CallBottomBar : Gtk.Box {
this.add_css_class("call-bottom-bar");
}
+ private static void menu_button_set_icon_with_size(MenuButton menu_button, string icon_name, int pixel_size) {
+#if GTK_4_6
+ menu_button.set_child(new Image.from_icon_name(icon_name) { pixel_size=pixel_size });
+#else
+ menu_button.set_icon_name(icon_name);
+ var button = menu_button.get_first_child() as Button;
+ if (button == null) return;
+ var box = button.child as Box;
+ if (box == null) return;
+ var image = box.get_first_child() as Image;
+ if (image == null) return;
+ image.pixel_size = pixel_size;
+#endif
+ }
+
public AudioSettingsPopover? show_audio_device_choices(bool show) {
audio_settings_button.visible = show;
if (audio_settings_popover != null) audio_settings_popover.visible = false;