Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#109594, reported by Olivier Ripoll

Browse Source 
Wed Mar  3 16:47:10 2004  Owen Taylor  <otaylor@redhat.com>

         #109594, reported by Olivier Ripoll

        * gtk/gtkentry.c (gtk_entry_size_request): Use max of
        width and digit width for gtk_entry_set_width_chars,
        and round up.

        * gtk/gtkcolorsel.c (gtk_color_selection_init): Set the
        width of the entry to 7 chars.
This commit is contained in:
Owen Taylor
2004-03-03 22:02:02 +00:00
committed by Owen Taylor
parent 1199061397
commit 0d898ffc6a
7 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -1,3 +1,14 @@
Wed Mar 3 16:47:10 2004 Owen Taylor <otaylor@redhat.com>
#109594, reported by Olivier Ripoll
* gtk/gtkentry.c (gtk_entry_size_request): Use max of
width and digit width for gtk_entry_set_width_chars,
and round up.
* gtk/gtkcolorsel.c (gtk_color_selection_init): Set the
width of the entry to 7 chars.
Wed Mar 3 16:00:10 2004 Owen Taylor <otaylor@redhat.com>
* configure.in: Strip out the "export-dynamic" libtool

11
ChangeLog.pre-2-10
View File

@@ -1,3 +1,14 @@
Wed Mar 3 16:47:10 2004 Owen Taylor <otaylor@redhat.com>
#109594, reported by Olivier Ripoll
* gtk/gtkentry.c (gtk_entry_size_request): Use max of
width and digit width for gtk_entry_set_width_chars,
and round up.
* gtk/gtkcolorsel.c (gtk_color_selection_init): Set the
width of the entry to 7 chars.
Wed Mar 3 16:00:10 2004 Owen Taylor <otaylor@redhat.com>
* configure.in: Strip out the "export-dynamic" libtool

11
ChangeLog.pre-2-4
View File

@@ -1,3 +1,14 @@
Wed Mar 3 16:47:10 2004 Owen Taylor <otaylor@redhat.com>
#109594, reported by Olivier Ripoll
* gtk/gtkentry.c (gtk_entry_size_request): Use max of
width and digit width for gtk_entry_set_width_chars,
and round up.
* gtk/gtkcolorsel.c (gtk_color_selection_init): Set the
width of the entry to 7 chars.
Wed Mar 3 16:00:10 2004 Owen Taylor <otaylor@redhat.com>
* configure.in: Strip out the "export-dynamic" libtool

11
ChangeLog.pre-2-6
View File

@@ -1,3 +1,14 @@
Wed Mar 3 16:47:10 2004 Owen Taylor <otaylor@redhat.com>
#109594, reported by Olivier Ripoll
* gtk/gtkentry.c (gtk_entry_size_request): Use max of
width and digit width for gtk_entry_set_width_chars,
and round up.
* gtk/gtkcolorsel.c (gtk_color_selection_init): Set the
width of the entry to 7 chars.
Wed Mar 3 16:00:10 2004 Owen Taylor <otaylor@redhat.com>
* configure.in: Strip out the "export-dynamic" libtool

11
ChangeLog.pre-2-8
View File

@@ -1,3 +1,14 @@
Wed Mar 3 16:47:10 2004 Owen Taylor <otaylor@redhat.com>
#109594, reported by Olivier Ripoll
* gtk/gtkentry.c (gtk_entry_size_request): Use max of
width and digit width for gtk_entry_set_width_chars,
and round up.
* gtk/gtkcolorsel.c (gtk_color_selection_init): Set the
width of the entry to 7 chars.
Wed Mar 3 16:00:10 2004 Owen Taylor <otaylor@redhat.com>
* configure.in: Strip out the "export-dynamic" libtool

2
gtk/gtkcolorsel.c
View File

@@ -1928,7 +1928,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
priv->hex_entry,
_("You can enter an HTML-style hexadecimal color value, or simply a color name such as 'orange' in this entry."), NULL);
gtk_widget_set_size_request (priv->hex_entry, 75, -1);
gtk_entry_set_width_chars (GTK_ENTRY (priv->hex_entry), 7);
gtk_table_set_col_spacing (GTK_TABLE (table), 3, 15);
gtk_table_attach_defaults (GTK_TABLE (table), priv->hex_entry, 1, 5, 5, 6);

5
gtk/gtkentry.c
View File

@@ -1144,7 +1144,10 @@ gtk_entry_size_request (GtkWidget *widget,
else
{
gint char_width = pango_font_metrics_get_approximate_char_width (metrics);
requisition->width = PANGO_PIXELS (char_width) * entry->width_chars + xborder * 2;
gint digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
gint char_pixels = (MAX (char_width, digit_width) + PANGO_SCALE - 1) / PANGO_SCALE;
requisition->width = char_pixels * entry->width_chars + xborder * 2;
}
requisition->height = PANGO_PIXELS (entry->ascent + entry->descent) + yborder * 2;