X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkseparatortoolitem.c;h=33a003a8ef878ec11b98689969b6d4911747e1c9;hb=56bcb1933f6de613e5d8689e23420d47b65425c3;hp=e5a04dba6a7a2dea051a45ee5927d06914d29ba2;hpb=271d66fc810f810301f2e8f2a2fd50b62e9e446a;p=~andy%2Fgtk diff --git a/gtk/gtkseparatortoolitem.c b/gtk/gtkseparatortoolitem.c index e5a04dba6..33a003a8e 100644 --- a/gtk/gtkseparatortoolitem.c +++ b/gtk/gtkseparatortoolitem.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" @@ -33,7 +31,7 @@ * @Title: GtkSeparatorToolItem * @See_also: #GtkToolbar, #GtkRadioToolButton * - * A #GtkSeparatorItem is a #GtkToolItem that separates groups of other + * A #GtkSeparatorToolItem is a #GtkToolItem that separates groups of other * #GtkToolItems. Depending on the theme, a #GtkSeparatorToolItem will * often look like a vertical line on horizontally docked toolbars. * @@ -66,12 +64,16 @@ static void gtk_separator_tool_item_get_property (GObject guint prop_id, GValue *value, GParamSpec *pspec); -static void gtk_separator_tool_item_size_request (GtkWidget *widget, - GtkRequisition *requisition); +static void gtk_separator_tool_item_get_preferred_width (GtkWidget *widget, + gint *minimum, + gint *natural); +static void gtk_separator_tool_item_get_preferred_height (GtkWidget *widget, + gint *minimum, + gint *natural); static void gtk_separator_tool_item_size_allocate (GtkWidget *widget, GtkAllocation *allocation); -static gboolean gtk_separator_tool_item_expose (GtkWidget *widget, - GdkEventExpose *event); +static gboolean gtk_separator_tool_item_draw (GtkWidget *widget, + cairo_t *cr); static void gtk_separator_tool_item_add (GtkContainer *container, GtkWidget *child); static gint get_space_size (GtkToolItem *tool_item); @@ -89,8 +91,10 @@ static gint get_space_size (GtkToolItem *tool_item) { gint space_size = _gtk_toolbar_get_default_space_size(); - GtkWidget *parent = GTK_WIDGET (tool_item)->parent; - + GtkWidget *parent; + + parent = gtk_widget_get_parent (GTK_WIDGET (tool_item)); + if (GTK_IS_TOOLBAR (parent)) { gtk_widget_style_get (parent, @@ -116,9 +120,10 @@ gtk_separator_tool_item_class_init (GtkSeparatorToolItemClass *class) object_class->set_property = gtk_separator_tool_item_set_property; object_class->get_property = gtk_separator_tool_item_get_property; - widget_class->size_request = gtk_separator_tool_item_size_request; + widget_class->get_preferred_width = gtk_separator_tool_item_get_preferred_width; + widget_class->get_preferred_height = gtk_separator_tool_item_get_preferred_height; widget_class->size_allocate = gtk_separator_tool_item_size_allocate; - widget_class->expose_event = gtk_separator_tool_item_expose; + widget_class->draw = gtk_separator_tool_item_draw; widget_class->realize = gtk_separator_tool_item_realize; widget_class->unrealize = gtk_separator_tool_item_unrealize; widget_class->map = gtk_separator_tool_item_map; @@ -145,12 +150,17 @@ gtk_separator_tool_item_class_init (GtkSeparatorToolItemClass *class) static void gtk_separator_tool_item_init (GtkSeparatorToolItem *separator_item) { + GtkStyleContext *context; + separator_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (separator_item, GTK_TYPE_SEPARATOR_TOOL_ITEM, GtkSeparatorToolItemPrivate); separator_item->priv->draw = TRUE; gtk_widget_set_has_window (GTK_WIDGET (separator_item), FALSE); + + context = gtk_widget_get_style_context (GTK_WIDGET (separator_item)); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_SEPARATOR); } static void @@ -211,22 +221,37 @@ gtk_separator_tool_item_get_property (GObject *object, } static void -gtk_separator_tool_item_size_request (GtkWidget *widget, - GtkRequisition *requisition) +gtk_separator_tool_item_get_preferred_size (GtkWidget *widget, + GtkOrientation orientation, + gint *minimum, + gint *natural) { - GtkToolItem *item = GTK_TOOL_ITEM (widget); - GtkOrientation orientation = gtk_tool_item_get_orientation (item); - - if (orientation == GTK_ORIENTATION_HORIZONTAL) - { - requisition->width = get_space_size (item); - requisition->height = 1; - } + if (gtk_tool_item_get_orientation (GTK_TOOL_ITEM (widget)) == orientation) + *minimum = *natural = get_space_size (GTK_TOOL_ITEM (widget)); else - { - requisition->height = get_space_size (item); - requisition->width = 1; - } + *minimum = *natural = 1; +} + +static void +gtk_separator_tool_item_get_preferred_width (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + gtk_separator_tool_item_get_preferred_size (widget, + GTK_ORIENTATION_HORIZONTAL, + minimum, + natural); +} + +static void +gtk_separator_tool_item_get_preferred_height (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + gtk_separator_tool_item_get_preferred_size (widget, + GTK_ORIENTATION_VERTICAL, + minimum, + natural); } static void @@ -236,48 +261,50 @@ gtk_separator_tool_item_size_allocate (GtkWidget *widget, GtkSeparatorToolItem *separator = GTK_SEPARATOR_TOOL_ITEM (widget); GtkSeparatorToolItemPrivate *priv = separator->priv; - widget->allocation = *allocation; + gtk_widget_set_allocation (widget, allocation); if (gtk_widget_get_realized (widget)) gdk_window_move_resize (priv->event_window, - widget->allocation.x, - widget->allocation.y, - widget->allocation.width, - widget->allocation.height); + allocation->x, + allocation->y, + allocation->width, + allocation->height); } static void gtk_separator_tool_item_realize (GtkWidget *widget) { + GtkAllocation allocation; GtkSeparatorToolItem *separator = GTK_SEPARATOR_TOOL_ITEM (widget); GtkSeparatorToolItemPrivate *priv = separator->priv; + GdkWindow *window; GdkWindowAttr attributes; gint attributes_mask; gtk_widget_set_realized (widget, TRUE); + gtk_widget_get_allocation (widget, &allocation); + attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = widget->allocation.x; - attributes.y = widget->allocation.y; - attributes.width = widget->allocation.width; - attributes.height = widget->allocation.height; + attributes.x = allocation.x; + attributes.y = allocation.y; + attributes.width = allocation.width; + attributes.height = allocation.height; attributes.wclass = GDK_INPUT_ONLY; attributes.visual = gtk_widget_get_visual (widget); - attributes.colormap = gtk_widget_get_colormap (widget); attributes.event_mask = gtk_widget_get_events (widget) | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK; attributes_mask = GDK_WA_X | GDK_WA_Y; - widget->window = gtk_widget_get_parent_window (widget); - g_object_ref (widget->window); + window = gtk_widget_get_parent_window (widget); + gtk_widget_set_window (widget, window); + g_object_ref (window); priv->event_window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask); - gdk_window_set_user_data (priv->event_window, widget); - - widget->style = gtk_style_attach (widget->style, widget->window); + gtk_widget_register_window (widget, priv->event_window); } static void @@ -288,7 +315,7 @@ gtk_separator_tool_item_unrealize (GtkWidget *widget) if (priv->event_window) { - gdk_window_set_user_data (priv->event_window, NULL); + gtk_widget_unregister_window (widget, priv->event_window); gdk_window_destroy (priv->event_window); priv->event_window = NULL; } @@ -334,20 +361,23 @@ gtk_separator_tool_item_button_event (GtkWidget *widget, } static gboolean -gtk_separator_tool_item_expose (GtkWidget *widget, - GdkEventExpose *event) +gtk_separator_tool_item_draw (GtkWidget *widget, + cairo_t *cr) { + GtkAllocation allocation; GtkToolbar *toolbar = NULL; GtkSeparatorToolItem *separator = GTK_SEPARATOR_TOOL_ITEM (widget); GtkSeparatorToolItemPrivate *priv = separator->priv; + GtkWidget *parent; if (priv->draw) { - if (GTK_IS_TOOLBAR (widget->parent)) - toolbar = GTK_TOOLBAR (widget->parent); + parent = gtk_widget_get_parent (widget); + if (GTK_IS_TOOLBAR (parent)) + toolbar = GTK_TOOLBAR (parent); - _gtk_toolbar_paint_space_line (widget, toolbar, - &(event->area), &widget->allocation); + gtk_widget_get_allocation (widget, &allocation); + _gtk_toolbar_paint_space_line (widget, toolbar, cr); } return FALSE;