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

Revert "css: Fix segfault when GtkCssStyleChange is NULL on gtk_widget_real_style_updated()"

Browse Source 
This reverts commit 7e253f4bd3.
This commit is contained in:
Matthias Clasen 2017-12-17 11:20:15 -05:00
parent 7d23b33ac5
commit f44af2e6ae
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkwidget.c
View File

@ -8162,15 +8162,12 @@ static void
gtk_widget_real_style_updated (GtkWidget *widget)
{
GtkWidgetPrivate *priv = widget->priv;
GtkCssStyleChange *change = NULL;
gtk_widget_update_alpha (widget);
if (widget->priv->context)
change = gtk_style_context_get_change (widget->priv->context);
if (change)
{
GtkCssStyleChange *change = gtk_style_context_get_change (widget->priv->context);
const gboolean has_text = gtk_widget_peek_pango_context (widget) != NULL;
if (has_text && gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_TEXT))
@ -8178,7 +8175,8 @@ gtk_widget_real_style_updated (GtkWidget *widget)
if (widget->priv->anchored)
{
if (gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_SIZE) ||
if (change == NULL ||
gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_SIZE) ||
(has_text && gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_TEXT_SIZE)))
{
gtk_widget_queue_resize (widget);