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

assistant: pack the sidebar in a frame instead of an event box

Browse Source 
This has mostly two advantages:
- the most obvious one is the theme can render a border around the
  sidebar if it wants to.
- we also can avoid hardcoding a container border width for the sidebar,
  and just use a padding from the theme. This also allows different
  themes to define a different padding, etc.

The drawback is we must draw the background ourselves, but it's easy
enough.

https://bugzilla.gnome.org/show_bug.cgi?id=650530
This commit is contained in:
Cosimo Cecchi
2011-05-18 17:22:40 -04:00
parent 6bbb9d6f15
commit 8301b24ee5
1 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gtk/gtkassistant.c
View File

@ -65,7 +65,7 @@
#include "gtkaccessibleprivate.h"
#include "gtkbutton.h"
#include "gtkbox.h"
#include "gtkeventbox.h"
#include "gtkframe.h"
#include "gtknotebook.h"
#include "gtkimage.h"
#include "gtklabel.h"
@ -846,6 +846,23 @@ alternative_button_order (GtkAssistant *assistant)
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
gtk_assistant_init (GtkAssistant *assistant)
{
@ -853,7 +870,7 @@ gtk_assistant_init (GtkAssistant *assistant)
GtkStyleContext *context;
GtkWidget *main_box;
GtkWidget *content_box;
GtkWidget *side_box;
GtkWidget *sidebar_frame;
assistant->priv = G_TYPE_INSTANCE_GET_PRIVATE (assistant,
GTK_TYPE_ASSISTANT,
@ -867,12 +884,17 @@ gtk_assistant_init (GtkAssistant *assistant)
main_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
priv->sidebar = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_set_border_width (GTK_CONTAINER (priv->sidebar), 12);
/* Add an event box so we can set the background */
side_box = gtk_event_box_new ();
context = gtk_widget_get_style_context (side_box);
/* use a frame for the sidebar, and manually render a background
* in it. GtkFrame also gives us padding support for free.
*/
sidebar_frame = gtk_frame_new (NULL);
context = gtk_widget_get_style_context (sidebar_frame);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_SIDEBAR);
g_signal_connect (sidebar_frame, "draw",
G_CALLBACK (assistant_sidebar_draw_cb), assistant);
content_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (content_box), 12);
priv->content = gtk_notebook_new ();
@ -880,8 +902,8 @@ gtk_assistant_init (GtkAssistant *assistant)
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->content), FALSE);
priv->action_area = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_container_add (GTK_CONTAINER (side_box), priv->sidebar);
gtk_box_pack_start (GTK_BOX (main_box), side_box, FALSE, FALSE, 0);
gtk_container_add (GTK_CONTAINER (sidebar_frame), priv->sidebar);
gtk_box_pack_start (GTK_BOX (main_box), sidebar_frame, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_box), content_box, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (content_box), priv->content, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (content_box), priv->action_area, FALSE, TRUE, 0);