diff options
author | Gerald Combs <gerald@wireshark.org> | 2013-03-21 23:25:58 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2013-03-21 23:25:58 +0000 |
commit | 6ef9a20ae97558c860e4bb03542b1990d40aad01 (patch) | |
tree | 9266aa614ddb4b263e4f107f47da43460be73ff2 /ui/gtk/capture_if_dlg.c | |
parent | 86b9b1607500388982037159eb7db3adff9a2607 (diff) |
Only elide text that's longer than 50 characters.
svn path=/trunk/; revision=48468
Diffstat (limited to 'ui/gtk/capture_if_dlg.c')
-rw-r--r-- | ui/gtk/capture_if_dlg.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c index 50c1b288ea..8070b8f812 100644 --- a/ui/gtk/capture_if_dlg.c +++ b/ui/gtk/capture_if_dlg.c @@ -91,6 +91,7 @@ #define CAPTURE_IF_IP_ADDR_LABEL "capture_if_ip_addr_label" #define CAPTURE_IF_SELECTED_IP_ADDR "capture_if_selected_ip_addr" +#define SOFT_LABEL_LEN 50 /* * Keep a static pointer to the current "Capture Interfaces" window, if @@ -738,7 +739,9 @@ capture_if_refresh_if_list(void) data.device_lb = gtk_label_new(device.name); #endif gtk_misc_set_alignment(GTK_MISC(data.device_lb), 0.0f, 0.5f); - gtk_label_set_ellipsize(GTK_LABEL(data.device_lb), PANGO_ELLIPSIZE_MIDDLE); + if (strlen(gtk_label_get_text(GTK_LABEL(data.device_lb))) > SOFT_LABEL_LEN) { + gtk_label_set_ellipsize(GTK_LABEL(data.device_lb), PANGO_ELLIPSIZE_MIDDLE); + } ws_gtk_grid_attach_defaults(GTK_GRID(if_grid), data.device_lb, 2, row, 2, 1); /* description */ @@ -753,7 +756,9 @@ capture_if_refresh_if_list(void) data.descr_lb = gtk_label_new(""); } gtk_misc_set_alignment(GTK_MISC(data.descr_lb), 0.0f, 0.5f); - gtk_label_set_ellipsize(GTK_LABEL(data.descr_lb), PANGO_ELLIPSIZE_MIDDLE); + if (strlen(gtk_label_get_text(GTK_LABEL(data.descr_lb))) > SOFT_LABEL_LEN) { + gtk_label_set_ellipsize(GTK_LABEL(data.descr_lb), PANGO_ELLIPSIZE_MIDDLE); + } ws_gtk_grid_attach_defaults(GTK_GRID(if_grid), data.descr_lb, 4, row, 1, 1); /* IP address */ |