callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always queue a resize ... we rely on the size-allocate to do the update,

Browse Source 
Wed May 21 15:53:14 2003  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkprogress.c (gtk_progress_set_format_string,
        gtk_progress_set_show_text): Always queue a resize ...
        we rely on the size-allocate to do the update, plus a
        different format can actually change our size requisition.
        (#111052)

        * gtk/gtkprogress.c (gtk_progress_changed): Track
        ::changed as well as ::value_changed, and queue a
        resize on ::changed when necessary.

        * gtk/gtkprogress.c (gtk_progress_set_adjustment):
        Call gtk_progress_changed() here to update or
        queue a resize as necessary.
This commit is contained in:
Owen Taylor 2003-05-21 21:23:35 +00:00 committed by Owen Taylor
parent 611a2667e6
commit e47517cdbb
6 changed files with 113 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,7 +1,23 @@
Wed May 21 15:53:14 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogress.c (gtk_progress_set_format_string,
gtk_progress_set_show_text): Always queue a resize ...
we rely on the size-allocate to do the update, plus a
different format can actually change our size requisition.
(#111052)
* gtk/gtkprogress.c (gtk_progress_changed): Track
::changed as well as ::value_changed, and queue a
resize on ::changed when necessary.
* gtk/gtkprogress.c (gtk_progress_set_adjustment):
Call gtk_progress_changed() here to update or
queue a resize as necessary.
Wed May 21 14:06:13 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com> Wed May 21 14:06:13 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* gtk/gtkimcontextsimple.c: added composing rules of * gtk/gtkimcontextsimple.c: added composing rules of
Greek acceted letters, patch by Vasilis Vasaitis (#107507) Greek accented letters, patch by Vasilis Vasaitis (#107507)
Wed May 21 13:19:05 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com> Wed May 21 13:19:05 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>

18
ChangeLog.pre-2-10
View File

@ -1,7 +1,23 @@
Wed May 21 15:53:14 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogress.c (gtk_progress_set_format_string,
gtk_progress_set_show_text): Always queue a resize ...
we rely on the size-allocate to do the update, plus a
different format can actually change our size requisition.
(#111052)
* gtk/gtkprogress.c (gtk_progress_changed): Track
::changed as well as ::value_changed, and queue a
resize on ::changed when necessary.
* gtk/gtkprogress.c (gtk_progress_set_adjustment):
Call gtk_progress_changed() here to update or
queue a resize as necessary.
Wed May 21 14:06:13 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com> Wed May 21 14:06:13 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* gtk/gtkimcontextsimple.c: added composing rules of * gtk/gtkimcontextsimple.c: added composing rules of
Greek acceted letters, patch by Vasilis Vasaitis (#107507) Greek accented letters, patch by Vasilis Vasaitis (#107507)
Wed May 21 13:19:05 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com> Wed May 21 13:19:05 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>

18
ChangeLog.pre-2-4
View File

@ -1,7 +1,23 @@
Wed May 21 15:53:14 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogress.c (gtk_progress_set_format_string,
gtk_progress_set_show_text): Always queue a resize ...
we rely on the size-allocate to do the update, plus a
different format can actually change our size requisition.
(#111052)
* gtk/gtkprogress.c (gtk_progress_changed): Track
::changed as well as ::value_changed, and queue a
resize on ::changed when necessary.
* gtk/gtkprogress.c (gtk_progress_set_adjustment):
Call gtk_progress_changed() here to update or
queue a resize as necessary.
Wed May 21 14:06:13 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com> Wed May 21 14:06:13 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* gtk/gtkimcontextsimple.c: added composing rules of * gtk/gtkimcontextsimple.c: added composing rules of
Greek acceted letters, patch by Vasilis Vasaitis (#107507) Greek accented letters, patch by Vasilis Vasaitis (#107507)
Wed May 21 13:19:05 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com> Wed May 21 13:19:05 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>

18
ChangeLog.pre-2-6
View File

@ -1,7 +1,23 @@
Wed May 21 15:53:14 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogress.c (gtk_progress_set_format_string,
gtk_progress_set_show_text): Always queue a resize ...
we rely on the size-allocate to do the update, plus a
different format can actually change our size requisition.
(#111052)
* gtk/gtkprogress.c (gtk_progress_changed): Track
::changed as well as ::value_changed, and queue a
resize on ::changed when necessary.
* gtk/gtkprogress.c (gtk_progress_set_adjustment):
Call gtk_progress_changed() here to update or
queue a resize as necessary.
Wed May 21 14:06:13 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com> Wed May 21 14:06:13 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* gtk/gtkimcontextsimple.c: added composing rules of * gtk/gtkimcontextsimple.c: added composing rules of
Greek acceted letters, patch by Vasilis Vasaitis (#107507) Greek accented letters, patch by Vasilis Vasaitis (#107507)
Wed May 21 13:19:05 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com> Wed May 21 13:19:05 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>

18
ChangeLog.pre-2-8
View File

@ -1,7 +1,23 @@
Wed May 21 15:53:14 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogress.c (gtk_progress_set_format_string,
gtk_progress_set_show_text): Always queue a resize ...
we rely on the size-allocate to do the update, plus a
different format can actually change our size requisition.
(#111052)
* gtk/gtkprogress.c (gtk_progress_changed): Track
::changed as well as ::value_changed, and queue a
resize on ::changed when necessary.
* gtk/gtkprogress.c (gtk_progress_set_adjustment):
Call gtk_progress_changed() here to update or
queue a resize as necessary.
Wed May 21 14:06:13 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com> Wed May 21 14:06:13 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* gtk/gtkimcontextsimple.c: added composing rules of * gtk/gtkimcontextsimple.c: added composing rules of
Greek acceted letters, patch by Vasilis Vasaitis (#107507) Greek accented letters, patch by Vasilis Vasaitis (#107507)
Wed May 21 13:19:05 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com> Wed May 21 13:19:05 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>

28
gtk/gtkprogress.c
View File

@ -62,6 +62,8 @@ static void gtk_progress_size_allocate (GtkWidget *widget,
static void gtk_progress_create_pixmap (GtkProgress *progress); static void gtk_progress_create_pixmap (GtkProgress *progress);
static void gtk_progress_value_changed (GtkAdjustment *adjustment, static void gtk_progress_value_changed (GtkAdjustment *adjustment,
GtkProgress *progress); GtkProgress *progress);
static void gtk_progress_changed (GtkAdjustment *adjustment,
GtkProgress *progress);
static GtkWidgetClass *parent_class = NULL; static GtkWidgetClass *parent_class = NULL;
@ -283,6 +285,9 @@ gtk_progress_destroy (GtkObject *object)
g_signal_handlers_disconnect_by_func (progress->adjustment, g_signal_handlers_disconnect_by_func (progress->adjustment,
gtk_progress_value_changed, gtk_progress_value_changed,
progress); progress);
g_signal_handlers_disconnect_by_func (progress->adjustment,
gtk_progress_changed,
progress);
g_object_unref (progress->adjustment); g_object_unref (progress->adjustment);
progress->adjustment = NULL; progress->adjustment = NULL;
} }
@ -368,6 +373,19 @@ gtk_progress_create_pixmap (GtkProgress *progress)
} }
} }
static void
gtk_progress_changed (GtkAdjustment *adjustment,
GtkProgress *progress)
{
/* A change in the value of adjustment->upper can change
* the size request
*/
if (progress->use_text_format && progress->show_text)
gtk_widget_queue_resize (progress);
else
GTK_PROGRESS_GET_CLASS (progress)->update (progress);
}
static void static void
gtk_progress_value_changed (GtkAdjustment *adjustment, gtk_progress_value_changed (GtkAdjustment *adjustment,
GtkProgress *progress) GtkProgress *progress)
@ -503,6 +521,9 @@ gtk_progress_set_adjustment (GtkProgress *progress,
{ {
if (progress->adjustment) if (progress->adjustment)
{ {
g_signal_handlers_disconnect_by_func (progress->adjustment,
gtk_progress_changed,
progress);
g_signal_handlers_disconnect_by_func (progress->adjustment, g_signal_handlers_disconnect_by_func (progress->adjustment,
gtk_progress_value_changed, gtk_progress_value_changed,
progress); progress);
@ -513,10 +534,15 @@ gtk_progress_set_adjustment (GtkProgress *progress,
{ {
g_object_ref (adjustment); g_object_ref (adjustment);
gtk_object_sink (GTK_OBJECT (adjustment)); gtk_object_sink (GTK_OBJECT (adjustment));
g_signal_connect (adjustment, "changed",
G_CALLBACK (gtk_progress_changed),
progress);
g_signal_connect (adjustment, "value_changed", g_signal_connect (adjustment, "value_changed",
G_CALLBACK (gtk_progress_value_changed), G_CALLBACK (gtk_progress_value_changed),
progress); progress);
} }
gtk_progress_changed (adjustment, progress);
} }
} }
@ -622,7 +648,6 @@ gtk_progress_set_show_text (GtkProgress *progress,
{ {
progress->show_text = show_text; progress->show_text = show_text;
if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (progress)))
gtk_widget_queue_resize (GTK_WIDGET (progress)); gtk_widget_queue_resize (GTK_WIDGET (progress));
g_object_notify (G_OBJECT (progress), "show_text"); g_object_notify (G_OBJECT (progress), "show_text");
@ -680,7 +705,6 @@ gtk_progress_set_format_string (GtkProgress *progress,
progress->format = g_strdup (format); progress->format = g_strdup (format);
g_free (old_format); g_free (old_format);
if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (progress)))
gtk_widget_queue_resize (GTK_WIDGET (progress)); gtk_widget_queue_resize (GTK_WIDGET (progress));
} }