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

GtkAssistant: Don't use a draw cb for the sidebar

Browse Source 
We can do this with css nowadays.
This commit is contained in:
Matthias Clasen 2014-08-21 23:07:04 -04:00
parent a3a6ce1b42
commit c3755d995f
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtkassistant.c
View File

@ -171,9 +171,6 @@ static void gtk_assistant_do_set_page_side_image (GtkAssistant *ass
GtkWidget *page, GtkWidget *page,
GdkPixbuf *pixbuf); GdkPixbuf *pixbuf);
static gboolean assistant_sidebar_draw_cb (GtkWidget *widget,
cairo_t *cr,
gpointer user_data);
static void on_assistant_close (GtkWidget *widget, static void on_assistant_close (GtkWidget *widget,
GtkAssistant *assistant); GtkAssistant *assistant);
static void on_assistant_apply (GtkWidget *widget, static void on_assistant_apply (GtkWidget *widget,
@ -615,7 +612,6 @@ gtk_assistant_class_init (GtkAssistantClass *class)
gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, button_size_group); gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, button_size_group);
gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, title_size_group); gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, title_size_group);
gtk_widget_class_bind_template_callback (widget_class, assistant_sidebar_draw_cb);
gtk_widget_class_bind_template_callback (widget_class, assistant_remove_page_cb); gtk_widget_class_bind_template_callback (widget_class, assistant_remove_page_cb);
gtk_widget_class_bind_template_callback (widget_class, on_assistant_close); gtk_widget_class_bind_template_callback (widget_class, on_assistant_close);
gtk_widget_class_bind_template_callback (widget_class, on_assistant_apply); gtk_widget_class_bind_template_callback (widget_class, on_assistant_apply);
@ -1069,23 +1065,6 @@ alternative_button_order (GtkAssistant *assistant)
return result; return result;
} }
static gboolean
assistant_sidebar_draw_cb (GtkWidget *widget,
cairo_t *cr,
gpointer user_data)
{
gint width, height;
GtkStyleContext *context;
width = gtk_widget_get_allocated_width (widget);
height = gtk_widget_get_allocated_height (widget);
context = gtk_widget_get_style_context (widget);
gtk_render_background (context, cr, 0, 0, width, height);
return FALSE;
}
static void static void
on_page_notify_visibility (GtkWidget *widget, on_page_notify_visibility (GtkWidget *widget,
GParamSpec *arg, GParamSpec *arg,

1
gtk/resources/ui/gtkassistant.ui
View File

@ -24,7 +24,6 @@
<style> <style>
<class name="sidebar"/> <class name="sidebar"/>
</style> </style>
<signal name="draw" handler="assistant_sidebar_draw_cb" swapped="no"/>
<child> <child>
<object class="GtkBox" id="sidebar"> <object class="GtkBox" id="sidebar">
<property name="visible">True</property> <property name="visible">True</property>