mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-23 20:46:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Style guide formatting.

Browse Source 
svn path=/trunk/netsurf/; revision=5535
This commit is contained in:
Michael Drake 2008-10-11 15:12:42 +00:00
parent 56f8f275fd
commit 2e584e3b04
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gtk/gtk_tabs.c
View File

@ -84,7 +84,6 @@ void nsgtk_tab_set_title(struct gui_window *g, const char *title)
if (is_top_level) { if (is_top_level) {
label = g_object_get_data(G_OBJECT(g->tab), "label"); label = g_object_get_data(G_OBJECT(g->tab), "label");
gtk_label_set_text(GTK_LABEL(label), title); gtk_label_set_text(GTK_LABEL(label), title);
gtk_widget_set_tooltip_text(g->tab, title); gtk_widget_set_tooltip_text(g->tab, title);
} }
} }
@ -97,13 +96,14 @@ GtkWidget *nsgtk_tab_label_setup(struct gui_window *window)
hbox = gtk_hbox_new(FALSE, 2); hbox = gtk_hbox_new(FALSE, 2);
label = gtk_label_new("Loading..."); label = gtk_label_new("Loading...");
gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END); gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END);
gtk_label_set_single_line_mode(GTK_LABEL(label), TRUE); gtk_label_set_single_line_mode(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_misc_set_padding(GTK_MISC(label), 0, 0); gtk_misc_set_padding(GTK_MISC(label), 0, 0);
gtk_widget_show(label); gtk_widget_show(label);
button = gtk_button_new(); button = gtk_button_new();
close = gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU); close = gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU);
gtk_container_add(GTK_CONTAINER(button), close); gtk_container_add(GTK_CONTAINER(button), close);
gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE); gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE);
@ -123,8 +123,8 @@ GtkWidget *nsgtk_tab_label_setup(struct gui_window *window)
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (hbox), "label", label); g_object_set_data(G_OBJECT(hbox), "label", label);
g_object_set_data (G_OBJECT (hbox), "close-button", button); g_object_set_data(G_OBJECT(hbox), "close-button", button);
window->tab = hbox; window->tab = hbox;
@ -139,16 +139,15 @@ void nsgtk_tab_update_size(GtkWidget *hbox, GtkStyle *previous_style,
PangoContext *context; PangoContext *context;
int char_width, h, w; int char_width, h, w;
context = gtk_widget_get_pango_context (hbox); context = gtk_widget_get_pango_context(hbox);
metrics = pango_context_get_metrics (context, hbox->style->font_desc, metrics = pango_context_get_metrics(context, hbox->style->font_desc,
pango_context_get_language( pango_context_get_language(context));
context));
char_width = pango_font_metrics_get_approximate_digit_width (metrics); char_width = pango_font_metrics_get_approximate_digit_width(metrics);
pango_font_metrics_unref (metrics); pango_font_metrics_unref(metrics);
gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (hbox), gtk_icon_size_lookup_for_settings(gtk_widget_get_settings (hbox),
GTK_ICON_SIZE_MENU, &w, &h); GTK_ICON_SIZE_MENU, &w, &h);
gtk_widget_set_size_request(hbox, gtk_widget_set_size_request(hbox,
TAB_WIDTH_N_CHARS * PANGO_PIXELS(char_width) + 2 * w, TAB_WIDTH_N_CHARS * PANGO_PIXELS(char_width) + 2 * w,