Commit 52e0ab53 authored by Matthias Clasen's avatar Matthias Clasen

print dialog: More baseline alignment

Some places were missing the right valign setting to make
baselines line up properly.
parent e9300e2f
...@@ -736,6 +736,7 @@ alternative_append (GtkWidget *box, ...@@ -736,6 +736,7 @@ alternative_append (GtkWidget *box,
button = gtk_radio_button_new_with_label (group, label); button = gtk_radio_button_new_with_label (group, label);
gtk_widget_show (button); gtk_widget_show (button);
gtk_widget_set_valign (button, GTK_ALIGN_BASELINE);
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (button), "value", (gpointer)value); g_object_set_data (G_OBJECT (button), "value", (gpointer)value);
...@@ -819,6 +820,7 @@ construct_widgets (GtkPrinterOptionWidget *widget) ...@@ -819,6 +820,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
case GTK_PRINTER_OPTION_TYPE_ALTERNATIVE: case GTK_PRINTER_OPTION_TYPE_ALTERNATIVE:
group = NULL; group = NULL;
priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_widget_set_valign (priv->box, GTK_ALIGN_BASELINE);
gtk_widget_show (priv->box); gtk_widget_show (priv->box);
gtk_box_pack_start (GTK_BOX (widget), priv->box, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (widget), priv->box, TRUE, TRUE, 0);
for (i = 0; i < source->num_choices; i++) for (i = 0; i < source->num_choices; i++)
...@@ -837,6 +839,7 @@ construct_widgets (GtkPrinterOptionWidget *widget) ...@@ -837,6 +839,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
{ {
text = g_strdup_printf ("%s:", source->display_text); text = g_strdup_printf ("%s:", source->display_text);
priv->label = gtk_label_new_with_mnemonic (text); priv->label = gtk_label_new_with_mnemonic (text);
gtk_widget_set_valign (priv->label, GTK_ALIGN_BASELINE);
g_free (text); g_free (text);
gtk_widget_show (priv->label); gtk_widget_show (priv->label);
} }
......
...@@ -1342,13 +1342,16 @@ add_option_to_extension_point (GtkPrinterOption *option, ...@@ -1342,13 +1342,16 @@ add_option_to_extension_point (GtkPrinterOption *option,
{ {
GtkWidget *label, *hbox; GtkWidget *label, *hbox;
gtk_widget_set_valign (widget, GTK_ALIGN_BASELINE);
label = gtk_printer_option_widget_get_external_label (GTK_PRINTER_OPTION_WIDGET (widget)); label = gtk_printer_option_widget_get_external_label (GTK_PRINTER_OPTION_WIDGET (widget));
gtk_widget_show (label); gtk_widget_show (label);
gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_widget_set_valign (hbox, GTK_ALIGN_BASELINE);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
gtk_widget_show (hbox); gtk_widget_show (hbox);
......
...@@ -330,7 +330,7 @@ ...@@ -330,7 +330,7 @@
<object class="GtkLabel" id="label4"> <object class="GtkLabel" id="label4">
<property name="visible">1</property> <property name="visible">1</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="valign">center</property> <property name="valign">baseline</property>
<property name="label" translatable="yes">Copie_s:</property> <property name="label" translatable="yes">Copie_s:</property>
<property name="use_underline">1</property> <property name="use_underline">1</property>
<property name="mnemonic_widget">copies_spin</property> <property name="mnemonic_widget">copies_spin</property>
...@@ -344,6 +344,7 @@ ...@@ -344,6 +344,7 @@
<object class="GtkSpinButton" id="copies_spin"> <object class="GtkSpinButton" id="copies_spin">
<property name="visible">1</property> <property name="visible">1</property>
<property name="can_focus">1</property> <property name="can_focus">1</property>
<property name="valign">baseline</property>
<property name="invisible_char"></property> <property name="invisible_char"></property>
<property name="activates_default">1</property> <property name="activates_default">1</property>
<property name="adjustment">copies_spin_adjustment</property> <property name="adjustment">copies_spin_adjustment</property>
...@@ -594,6 +595,7 @@ ...@@ -594,6 +595,7 @@
<object class="GtkBox" id="box5"> <object class="GtkBox" id="box5">
<property name="visible">1</property> <property name="visible">1</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<property name="valign">baseline</property>
<child> <child>
<object class="GtkSpinButton" id="scale_spin"> <object class="GtkSpinButton" id="scale_spin">
<property name="visible">1</property> <property name="visible">1</property>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment