debian
/
midori
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-use saved ellipsize in midori_view_update_tab_title

This commit is contained in:
Christian Dywan 2012-08-25 16:11:37 +02:00
parent 879d6c41a7
commit 6757898c95
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
midori/midori-view.c
View File

@ -5176,20 +5176,14 @@ midori_view_tab_icon_style_set_cb (GtkWidget* tab_close,
#endif #endif
static void static void
midori_view_update_tab_title (GtkWidget* label, midori_view_update_tab_title (MidoriView* view,
gint size, gdouble angle)
gdouble angle)
{ {
if (angle == 0.0 || angle == 360.0) if (angle == 0.0)
{ gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), view->ellipsize);
if (gtk_label_get_ellipsize (GTK_LABEL (label)) != PANGO_ELLIPSIZE_START)
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
}
else else
{ gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), PANGO_ELLIPSIZE_NONE);
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_NONE); gtk_label_set_angle (GTK_LABEL (view->tab_title), angle);
}
gtk_label_set_angle (GTK_LABEL (label), angle);
} }
static void static void
@ -5273,7 +5267,7 @@ midori_view_tab_label_parent_set (GtkWidget* tab_label,
gtk_widget_show (box); gtk_widget_show (box);
} }
midori_view_update_tab_title (view->tab_title, 10, angle); midori_view_update_tab_title (view, angle);
/* FIXME: Connect orientation notification */ /* FIXME: Connect orientation notification */
} }
@ -5357,7 +5351,7 @@ midori_view_get_proxy_tab_label (MidoriView* view)
gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE); gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE);
hbox = gtk_hbox_new (FALSE, 1); hbox = gtk_hbox_new (FALSE, 1);
gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox)); gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox));
midori_view_update_tab_title (view->tab_title, 10, 0.0); midori_view_update_tab_title (view, 0.0);
view->tab_close = gtk_button_new (); view->tab_close = gtk_button_new ();
gtk_button_set_relief (GTK_BUTTON (view->tab_close), GTK_RELIEF_NONE); gtk_button_set_relief (GTK_BUTTON (view->tab_close), GTK_RELIEF_NONE);