forked from AuroraMiddleware/gtk
GtkColorSwatch: Avoid style context underflow
The last change accidentally removed the later restore, and left the earlier, so we ended up with a restore-save sequence. Thankfully, GtkStyleContext warns about this.
This commit is contained in:
parent
9f3dfa2031
commit
e1ff15549b
@ -183,8 +183,6 @@ swatch_draw (GtkWidget *widget,
|
|||||||
g_object_unref (gicon);
|
g_object_unref (gicon);
|
||||||
}
|
}
|
||||||
|
|
||||||
gtk_style_context_restore (context);
|
|
||||||
|
|
||||||
/* now draw the overlay image */
|
/* now draw the overlay image */
|
||||||
gtk_style_context_get_border (context, state, &border);
|
gtk_style_context_get_border (context, state, &border);
|
||||||
gtk_style_context_get_padding (context, state, &padding);
|
gtk_style_context_get_padding (context, state, &padding);
|
||||||
@ -222,6 +220,8 @@ swatch_draw (GtkWidget *widget,
|
|||||||
gtk_render_focus (context, cr, 0, 0, width, height);
|
gtk_render_focus (context, cr, 0, 0, width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gtk_style_context_restore (context);
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user