Commit 13de9dc3 authored by Tim Janik's avatar Tim Janik Committed by Tim Janik

don't take '\n' into account for size computation (Damon Chaplin).

Wed Apr  8 00:00:48 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtklabel.c (gtk_label_expose): don't take '\n' into account for
                size computation (Damon Chaplin).

                        * gtk/gtkvscale.c (gtk_vscale_draw_value): adjusted static snprintf()
                                buffer size to 32 characters (Damon Chaplin).
                                        * gtk/gtkhscale.c (gtk_hscale_draw_value): likewise.

                                                * gtk/gtkmain.c (gtk_main_iteration_do): gdk_flush() the X-queue if
                                                        iteration_done==TRUE since we will most likely not get invoked again
                                                                (Marius Vollmer).
parent 6788abaa
Wed Apr 8 00:00:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtklabel.c (gtk_label_expose): don't take '\n' into account for
size computation (Damon Chaplin).
* gtk/gtkvscale.c (gtk_vscale_draw_value): adjusted static snprintf()
buffer size to 32 characters (Damon Chaplin).
* gtk/gtkhscale.c (gtk_hscale_draw_value): likewise.
* gtk/gtkmain.c (gtk_main_iteration_do): gdk_flush() the X-queue if
iteration_done==TRUE since we will most likely not get invoked again
(Marius Vollmer).
Mon Apr 6 23:48:29 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkwindow.c (gtk_window_realize): Set the
......
Wed Apr 8 00:00:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtklabel.c (gtk_label_expose): don't take '\n' into account for
size computation (Damon Chaplin).
* gtk/gtkvscale.c (gtk_vscale_draw_value): adjusted static snprintf()
buffer size to 32 characters (Damon Chaplin).
* gtk/gtkhscale.c (gtk_hscale_draw_value): likewise.
* gtk/gtkmain.c (gtk_main_iteration_do): gdk_flush() the X-queue if
iteration_done==TRUE since we will most likely not get invoked again
(Marius Vollmer).
Mon Apr 6 23:48:29 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkwindow.c (gtk_window_realize): Set the
......
Wed Apr 8 00:00:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtklabel.c (gtk_label_expose): don't take '\n' into account for
size computation (Damon Chaplin).
* gtk/gtkvscale.c (gtk_vscale_draw_value): adjusted static snprintf()
buffer size to 32 characters (Damon Chaplin).
* gtk/gtkhscale.c (gtk_hscale_draw_value): likewise.
* gtk/gtkmain.c (gtk_main_iteration_do): gdk_flush() the X-queue if
iteration_done==TRUE since we will most likely not get invoked again
(Marius Vollmer).
Mon Apr 6 23:48:29 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkwindow.c (gtk_window_realize): Set the
......
Wed Apr 8 00:00:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtklabel.c (gtk_label_expose): don't take '\n' into account for
size computation (Damon Chaplin).
* gtk/gtkvscale.c (gtk_vscale_draw_value): adjusted static snprintf()
buffer size to 32 characters (Damon Chaplin).
* gtk/gtkhscale.c (gtk_hscale_draw_value): likewise.
* gtk/gtkmain.c (gtk_main_iteration_do): gdk_flush() the X-queue if
iteration_done==TRUE since we will most likely not get invoked again
(Marius Vollmer).
Mon Apr 6 23:48:29 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkwindow.c (gtk_window_realize): Set the
......
Wed Apr 8 00:00:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtklabel.c (gtk_label_expose): don't take '\n' into account for
size computation (Damon Chaplin).
* gtk/gtkvscale.c (gtk_vscale_draw_value): adjusted static snprintf()
buffer size to 32 characters (Damon Chaplin).
* gtk/gtkhscale.c (gtk_hscale_draw_value): likewise.
* gtk/gtkmain.c (gtk_main_iteration_do): gdk_flush() the X-queue if
iteration_done==TRUE since we will most likely not get invoked again
(Marius Vollmer).
Mon Apr 6 23:48:29 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkwindow.c (gtk_window_realize): Set the
......
Wed Apr 8 00:00:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtklabel.c (gtk_label_expose): don't take '\n' into account for
size computation (Damon Chaplin).
* gtk/gtkvscale.c (gtk_vscale_draw_value): adjusted static snprintf()
buffer size to 32 characters (Damon Chaplin).
* gtk/gtkhscale.c (gtk_hscale_draw_value): likewise.
* gtk/gtkmain.c (gtk_main_iteration_do): gdk_flush() the X-queue if
iteration_done==TRUE since we will most likely not get invoked again
(Marius Vollmer).
Mon Apr 6 23:48:29 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkwindow.c (gtk_window_realize): Set the
......
Wed Apr 8 00:00:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtklabel.c (gtk_label_expose): don't take '\n' into account for
size computation (Damon Chaplin).
* gtk/gtkvscale.c (gtk_vscale_draw_value): adjusted static snprintf()
buffer size to 32 characters (Damon Chaplin).
* gtk/gtkhscale.c (gtk_hscale_draw_value): likewise.
* gtk/gtkmain.c (gtk_main_iteration_do): gdk_flush() the X-queue if
iteration_done==TRUE since we will most likely not get invoked again
(Marius Vollmer).
Mon Apr 6 23:48:29 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkwindow.c (gtk_window_realize): Set the
......
......@@ -333,7 +333,7 @@ static void
gtk_hscale_draw_value (GtkScale *scale)
{
GtkStateType state_type;
gchar buffer[16];
gchar buffer[32];
gint text_width;
gint width, height;
gint x, y;
......
......@@ -264,8 +264,9 @@ gtk_label_size_request (GtkWidget *widget,
{
if (row->next)
width = MAX (width,
gdk_text_width (GTK_WIDGET (label)->style->font, row->data,
(gchar*) row->next->data - (gchar*) row->data));
gdk_text_width (GTK_WIDGET (label)->style->font,
row->data,
(gchar*) row->next->data - (gchar*) row->data) - 1);
else
width = MAX (width, gdk_string_width (GTK_WIDGET (label)->style->font, row->data));
row = row->next;
......@@ -322,7 +323,7 @@ gtk_label_expose (GtkWidget *widget,
row = label->row;
while (row && row->next)
{
len = (gchar*) row->next->data - (gchar*) row->data;
len = (gchar*) row->next->data - (gchar*) row->data - 1;
offset = 0;
if (label->jtype == GTK_JUSTIFY_CENTER)
......
......@@ -519,11 +519,19 @@ gtk_main_iteration_do (gboolean blocking)
if (current_timeouts)
{
gtk_handle_current_timeouts( gdk_time_get());
if (iteration_done)
gdk_flush ();
return iteration_done;
}
if (current_idles)
{
gtk_handle_current_idles ();
if (iteration_done)
gdk_flush ();
return iteration_done;
}
......@@ -738,6 +746,9 @@ event_handling_done:
*/
gtk_handle_timeouts ();
if (iteration_done)
gdk_flush ();
return iteration_done;
}
......
......@@ -334,7 +334,7 @@ static void
gtk_vscale_draw_value (GtkScale *scale)
{
GtkStateType state_type;
gchar buffer[16];
gchar buffer[32];
gint text_width;
gint width, height;
gint x, y;
......
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