Skip to content

Linux + iPhone Continuity / iMessage / SMS

fix(gtk): better window sizing to prevent too big and too small

Zack Bartel2d4ee1a88d61
diff --git a/src/gtk/devices_view.cpp b/src/gtk/devices_view.cpp
index 8cf8f34..3c1668a 100644
--- a/src/gtk/devices_view.cpp
+++ b/src/gtk/devices_view.cpp
@@ -1567,6 +1567,7 @@ namespace tether::ui {
g_devices.lbl_airpods_reason = gtk_label_new(nullptr);
gtk_label_set_xalign(GTK_LABEL(g_devices.lbl_airpods_reason), 0.0);
gtk_label_set_line_wrap(GTK_LABEL(g_devices.lbl_airpods_reason), TRUE);
+ gtk_label_set_line_wrap_mode(GTK_LABEL(g_devices.lbl_airpods_reason), PANGO_WRAP_WORD_CHAR);
gtk_style_context_add_class(gtk_widget_get_style_context(g_devices.lbl_airpods_reason), "muted");
gtk_box_pack_start(GTK_BOX(airpods_box), g_devices.lbl_airpods_reason, FALSE, FALSE, 0);
@@ -1613,6 +1614,7 @@ namespace tether::ui {
g_devices.lbl_airpods_apple_id = gtk_label_new(nullptr);
gtk_label_set_xalign(GTK_LABEL(g_devices.lbl_airpods_apple_id), 0.0);
gtk_label_set_line_wrap(GTK_LABEL(g_devices.lbl_airpods_apple_id), TRUE);
+ gtk_label_set_line_wrap_mode(GTK_LABEL(g_devices.lbl_airpods_apple_id), PANGO_WRAP_WORD_CHAR);
gtk_label_set_selectable(GTK_LABEL(g_devices.lbl_airpods_apple_id), TRUE);
gtk_style_context_add_class(gtk_widget_get_style_context(g_devices.lbl_airpods_apple_id), "muted");
gtk_box_pack_start(GTK_BOX(airpods_box), g_devices.lbl_airpods_apple_id, FALSE, FALSE, 0);
@@ -1648,6 +1650,7 @@ namespace tether::ui {
gtk_label_set_xalign(GTK_LABEL(g_devices.lbl_bt_setup_command), 0.0);
gtk_label_set_selectable(GTK_LABEL(g_devices.lbl_bt_setup_command), TRUE);
gtk_label_set_line_wrap(GTK_LABEL(g_devices.lbl_bt_setup_command), TRUE);
+ gtk_label_set_line_wrap_mode(GTK_LABEL(g_devices.lbl_bt_setup_command), PANGO_WRAP_WORD_CHAR);
gtk_style_context_add_class(gtk_widget_get_style_context(g_devices.lbl_bt_setup_command),
"tether-setup-command");
gtk_box_pack_start(GTK_BOX(g_devices.bt_setup_box), g_devices.lbl_bt_setup_command, FALSE, FALSE, 0);
@@ -1690,6 +1693,7 @@ namespace tether::ui {
g_devices.lbl_bt_reason = gtk_label_new(nullptr);
gtk_label_set_xalign(GTK_LABEL(g_devices.lbl_bt_reason), 0.0);
gtk_label_set_line_wrap(GTK_LABEL(g_devices.lbl_bt_reason), TRUE);
+ gtk_label_set_line_wrap_mode(GTK_LABEL(g_devices.lbl_bt_reason), PANGO_WRAP_WORD_CHAR);
gtk_style_context_add_class(gtk_widget_get_style_context(g_devices.lbl_bt_reason), "muted");
gtk_box_pack_start(GTK_BOX(bt_box), g_devices.lbl_bt_reason, FALSE, FALSE, 0);
@@ -1714,6 +1718,7 @@ namespace tether::ui {
g_devices.lbl_bt_progress = gtk_label_new(nullptr);
gtk_label_set_xalign(GTK_LABEL(g_devices.lbl_bt_progress), 0.0);
gtk_label_set_line_wrap(GTK_LABEL(g_devices.lbl_bt_progress), TRUE);
+ gtk_label_set_line_wrap_mode(GTK_LABEL(g_devices.lbl_bt_progress), PANGO_WRAP_WORD_CHAR);
gtk_style_context_add_class(gtk_widget_get_style_context(g_devices.lbl_bt_progress), "muted");
gtk_box_pack_start(GTK_BOX(bt_box), g_devices.lbl_bt_progress, FALSE, FALSE, 0);
@@ -1823,7 +1828,11 @@ namespace tether::ui {
gtk_stack_add_named(GTK_STACK(g_devices.right_pane_stack), action_page, "action");
- gtk_paned_pack2(GTK_PANED(paned), g_devices.right_pane_stack, TRUE, FALSE);
+ GtkWidget* right_scroll = gtk_scrolled_window_new(nullptr, nullptr);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(right_scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
+ gtk_scrolled_window_set_propagate_natural_width(GTK_SCROLLED_WINDOW(right_scroll), TRUE);
+ gtk_container_add(GTK_CONTAINER(right_scroll), g_devices.right_pane_stack);
+ gtk_paned_pack2(GTK_PANED(paned), right_scroll, TRUE, FALSE);
gtk_stack_set_visible_child_name(GTK_STACK(g_devices.right_pane_stack), "placeholder");
return paned;
diff --git a/src/gtk/messages_view.cpp b/src/gtk/messages_view.cpp
index c339925..523282f 100644
--- a/src/gtk/messages_view.cpp
+++ b/src/gtk/messages_view.cpp
@@ -1059,6 +1059,7 @@ namespace tether::ui {
g_messages.banner_label = gtk_label_new(nullptr);
gtk_label_set_xalign(GTK_LABEL(g_messages.banner_label), 0.0);
gtk_label_set_line_wrap(GTK_LABEL(g_messages.banner_label), TRUE);
+ gtk_label_set_line_wrap_mode(GTK_LABEL(g_messages.banner_label), PANGO_WRAP_WORD_CHAR);
gtk_box_pack_start(GTK_BOX(g_messages.banner), g_messages.banner_label, TRUE, TRUE, 0);
g_messages.banner_action = gtk_button_new_with_label(_("Show iPhone Permissions"));
@@ -1245,6 +1246,7 @@ namespace tether::ui {
g_messages.send_error_label = gtk_label_new(nullptr);
gtk_label_set_xalign(GTK_LABEL(g_messages.send_error_label), 0.0);
gtk_label_set_line_wrap(GTK_LABEL(g_messages.send_error_label), TRUE);
+ gtk_label_set_line_wrap_mode(GTK_LABEL(g_messages.send_error_label), PANGO_WRAP_WORD_CHAR);
gtk_box_pack_start(GTK_BOX(g_messages.send_error), g_messages.send_error_label, TRUE, TRUE, 0);
GtkWidget* retry = gtk_button_new_with_label(_("Retry"));
gtk_widget_set_valign(retry, GTK_ALIGN_CENTER);
diff --git a/src/gtk/notifications_view.cpp b/src/gtk/notifications_view.cpp
index 92a705a..5ef57c8 100644
--- a/src/gtk/notifications_view.cpp
+++ b/src/gtk/notifications_view.cpp
@@ -72,6 +72,7 @@ namespace tether::ui {
GtkWidget* app_label = gtk_label_new(nullptr);
gtk_label_set_markup(GTK_LABEL(app_label), ("<b>" + escape_markup(app) + "</b>").c_str());
gtk_label_set_xalign(GTK_LABEL(app_label), 0.0);
+ gtk_label_set_ellipsize(GTK_LABEL(app_label), PANGO_ELLIPSIZE_END);
gtk_box_pack_start(GTK_BOX(header), app_label, TRUE, TRUE, 0);
if (!stamp.empty()) {
@@ -99,6 +100,7 @@ namespace tether::ui {
GtkWidget* detail_label = gtk_label_new(detail.c_str());
gtk_label_set_xalign(GTK_LABEL(detail_label), 0.0);
gtk_label_set_line_wrap(GTK_LABEL(detail_label), TRUE);
+ gtk_label_set_line_wrap_mode(GTK_LABEL(detail_label), PANGO_WRAP_WORD_CHAR);
gtk_label_set_selectable(GTK_LABEL(detail_label), TRUE);
gtk_box_pack_start(GTK_BOX(box), detail_label, FALSE, FALSE, 0);
@@ -113,6 +115,7 @@ namespace tether::ui {
GtkWidget* body_label = gtk_label_new(secondary.c_str());
gtk_label_set_xalign(GTK_LABEL(body_label), 0.0);
gtk_label_set_line_wrap(GTK_LABEL(body_label), TRUE);
+ gtk_label_set_line_wrap_mode(GTK_LABEL(body_label), PANGO_WRAP_WORD_CHAR);
gtk_label_set_selectable(GTK_LABEL(body_label), TRUE);
gtk_style_context_add_class(gtk_widget_get_style_context(body_label), "muted");
gtk_box_pack_start(GTK_BOX(box), body_label, FALSE, FALSE, 0);
@@ -182,6 +185,7 @@ namespace tether::ui {
gtk_box_pack_start(GTK_BOX(status_box), icon, FALSE, FALSE, 0);
g_notifications.status_label = gtk_label_new(_("Waiting for the iPhone."));
gtk_label_set_line_wrap(GTK_LABEL(g_notifications.status_label), TRUE);
+ gtk_label_set_line_wrap_mode(GTK_LABEL(g_notifications.status_label), PANGO_WRAP_WORD_CHAR);
gtk_label_set_justify(GTK_LABEL(g_notifications.status_label), GTK_JUSTIFY_CENTER);
gtk_style_context_add_class(gtk_widget_get_style_context(g_notifications.status_label), "muted");
gtk_box_pack_start(GTK_BOX(status_box), g_notifications.status_label, FALSE, FALSE, 0);