[Xfce4-commits] r26280 - xfce-mcs-plugins/branches/xfce_4_4/plugins/ui_plugin

[Brian Tarricone]

Author: kelnos
Date: 2007-11-09 07:52:16 +0000 (Fri, 09 Nov 2007)
New Revision: 26280

Modified:
   xfce-mcs-plugins/branches/xfce_4_4/plugins/ui_plugin/ui_plugin.c
Log:
backport: make window resizing more natural, based on patch from mike (bug 3659)


Modified: xfce-mcs-plugins/branches/xfce_4_4/plugins/ui_plugin/ui_plugin.c
===================================================================
--- xfce-mcs-plugins/branches/xfce_4_4/plugins/ui_plugin/ui_plugin.c	2007-11-09 07:50:17 UTC (rev 26279)
+++ xfce-mcs-plugins/branches/xfce_4_4/plugins/ui_plugin/ui_plugin.c	2007-11-09 07:52:16 UTC (rev 26280)
@@ -1036,11 +1036,11 @@
 
     dialog->aa_framebox = xfce_create_framebox_with_content (_("Font Rendering"), dialog->aa_table);
     gtk_widget_show(dialog->aa_framebox);
-    gtk_box_pack_start(GTK_BOX(dialog->dialog_vbox1), dialog->aa_framebox, TRUE, FALSE, BORDER);
+    gtk_box_pack_start(GTK_BOX(dialog->dialog_vbox1), dialog->aa_framebox, FALSE, FALSE, BORDER);
 
     dialog->aa_checkbox1 = gtk_check_button_new_with_label(_("Use anti-aliasing for fonts"));
     gtk_widget_show(dialog->aa_checkbox1);
-    gtk_table_attach(GTK_TABLE(dialog->aa_table), dialog->aa_checkbox1, 0, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND, BORDER, BORDER);
+    gtk_table_attach(GTK_TABLE(dialog->aa_table), dialog->aa_checkbox1, 0, 2, 0, 1, GTK_FILL, 0, BORDER, BORDER);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->aa_checkbox1), (gboolean) current_xft_antialias);
     gtk_tooltips_set_tip(tooltips, dialog->aa_checkbox1, 
         _("Antialiasing is an effect that is applied to the " 
@@ -1049,7 +1049,7 @@
 
     dialog->aa_checkbox2 = gtk_check_button_new_with_label(_("Use hinting:"));
     gtk_widget_show(dialog->aa_checkbox2);
-    gtk_table_attach(GTK_TABLE(dialog->aa_table), dialog->aa_checkbox2, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND, BORDER, BORDER);
+    gtk_table_attach(GTK_TABLE(dialog->aa_table), dialog->aa_checkbox2, 1, 2, 1, 2, GTK_FILL, 0, BORDER, BORDER);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->aa_checkbox2), (gboolean) current_xft_hinting);
     gtk_tooltips_set_tip(tooltips, dialog->aa_checkbox2,
         _("Hinting is a font-rendering technique that " 
@@ -1059,7 +1059,7 @@
 
     dialog->aa_omenu1 = gtk_combo_box_new_text();
     gtk_widget_show(dialog->aa_omenu1);
-    gtk_table_attach(GTK_TABLE(dialog->aa_table), dialog->aa_omenu1, 2, 3, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND, BORDER, BORDER);
+    gtk_table_attach(GTK_TABLE(dialog->aa_table), dialog->aa_omenu1, 2, 3, 1, 2, GTK_EXPAND | GTK_FILL, 0, BORDER, BORDER);
     gtk_widget_set_sensitive(dialog->aa_omenu1, current_xft_hinting);
 
     gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->aa_omenu1), _("Slight"));
@@ -1070,7 +1070,7 @@
 
     dialog->aa_checkbox3 = gtk_check_button_new_with_label(_("Use sub-pixel hinting:"));
     gtk_widget_show(dialog->aa_checkbox3);
-    gtk_table_attach(GTK_TABLE(dialog->aa_table), dialog->aa_checkbox3, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_EXPAND, BORDER, BORDER);
+    gtk_table_attach(GTK_TABLE(dialog->aa_table), dialog->aa_checkbox3, 1, 2, 2, 3, GTK_FILL, 0, BORDER, BORDER);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->aa_checkbox3), (gboolean) (strcmp(current_xft_rgba, "none") != 0));
     gtk_tooltips_set_tip(tooltips, dialog->aa_checkbox3, 
         _("Select one of the options to specify the subpixel "
@@ -1080,7 +1080,7 @@
     dialog->aa_omenu2_list = gtk_list_store_new(2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
     dialog->aa_omenu2 = gtk_combo_box_new_with_model(GTK_TREE_MODEL(dialog->aa_omenu2_list));
     gtk_widget_show(dialog->aa_omenu2);
-    gtk_table_attach(GTK_TABLE(dialog->aa_table), dialog->aa_omenu2, 2, 3, 2, 3, GTK_EXPAND | GTK_FILL, GTK_EXPAND, BORDER, BORDER);
+    gtk_table_attach(GTK_TABLE(dialog->aa_table), dialog->aa_omenu2, 2, 3, 2, 3, GTK_EXPAND | GTK_FILL, 0, BORDER, BORDER);
     gtk_widget_set_sensitive(dialog->aa_omenu2, strcmp(current_xft_rgba, "none") != 0);
 
     cell[0] = gtk_cell_renderer_pixbuf_new();
@@ -1112,12 +1112,12 @@
     gtk_widget_show(dialog->dialog_action_area1);
     gtk_button_box_set_layout(GTK_BUTTON_BOX(dialog->dialog_action_area1), GTK_BUTTONBOX_END);
 
-    dialog->helpbutton1 = gtk_button_new_from_stock("gtk-help");
+    dialog->helpbutton1 = gtk_button_new_from_stock(GTK_STOCK_HELP);
     /* gtk_widget_show (helpbutton1); */
     gtk_dialog_add_action_widget(GTK_DIALOG(dialog->theme_dialog), dialog->helpbutton1, GTK_RESPONSE_HELP);
     GTK_WIDGET_SET_FLAGS(dialog->helpbutton1, GTK_CAN_DEFAULT);
 
-    dialog->closebutton1 = gtk_button_new_from_stock("gtk-close");
+    dialog->closebutton1 = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
     gtk_widget_show(dialog->closebutton1);
     gtk_dialog_add_action_widget(GTK_DIALOG(dialog->theme_dialog), dialog->closebutton1, GTK_RESPONSE_CLOSE);
     GTK_WIDGET_SET_FLAGS(dialog->closebutton1, GTK_CAN_DEFAULT);