#include "gtkhbox.h"
#include "gtkvscrollbar.h"
#include "gtksettings.h"
-#include "gtksizerequest.h"
#include "gtkprivate.h"
#include "gtkintl.h"
-#define DEFAULT_POPUP_DELAY 225
-#define DEFAULT_POPDOWN_DELAY 1000
-
#define NAVIGATION_REGION_OVERSHOOT 50 /* How much the navigation region
* extends below the submenu
*/
guint property_id,
GValue *value,
GParamSpec *pspec);
-static void gtk_menu_destroy (GtkObject *object);
+static void gtk_menu_destroy (GtkWidget *widget);
static void gtk_menu_realize (GtkWidget *widget);
static void gtk_menu_unrealize (GtkWidget *widget);
static void gtk_menu_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-static void gtk_menu_paint (GtkWidget *widget,
- GdkEventExpose *expose);
static void gtk_menu_show (GtkWidget *widget);
-static gboolean gtk_menu_expose (GtkWidget *widget,
- GdkEventExpose *event);
+static gboolean gtk_menu_draw (GtkWidget *widget,
+ cairo_t *cr);
static gboolean gtk_menu_key_press (GtkWidget *widget,
GdkEventKey *event);
static gboolean gtk_menu_scroll (GtkWidget *widget,
static void gtk_menu_deactivate (GtkMenuShell *menu_shell);
static void gtk_menu_show_all (GtkWidget *widget);
-static void gtk_menu_hide_all (GtkWidget *widget);
static void gtk_menu_position (GtkMenu *menu);
static void gtk_menu_reparent (GtkMenu *menu,
GtkWidget *new_parent,
static void _gtk_menu_refresh_accel_paths (GtkMenu *menu,
gboolean group_changed);
-static void gtk_menu_size_request_init (GtkSizeRequestIface *iface);
-static void gtk_menu_get_width (GtkSizeRequest *widget,
- gint *minimum_size,
- gint *natural_size);
-static void gtk_menu_get_height (GtkSizeRequest *widget,
- gint *minimum_size,
- gint *natural_size);
-static void gtk_menu_get_height_for_width (GtkSizeRequest *widget,
- gint for_size,
- gint *minimum_size,
- gint *natural_size);
+static void gtk_menu_get_preferred_width (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_menu_get_preferred_height (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_menu_get_preferred_height_for_width (GtkWidget *widget,
+ gint for_size,
+ gint *minimum_size,
+ gint *natural_size);
static const gchar attach_data_key[] = "gtk-menu-attach-data";
return G_TYPE_INSTANCE_GET_PRIVATE (menu, GTK_TYPE_MENU, GtkMenuPrivate);
}
-G_DEFINE_TYPE_WITH_CODE (GtkMenu, gtk_menu, GTK_TYPE_MENU_SHELL,
- G_IMPLEMENT_INTERFACE (GTK_TYPE_SIZE_REQUEST,
- gtk_menu_size_request_init))
+G_DEFINE_TYPE (GtkMenu, gtk_menu, GTK_TYPE_MENU_SHELL)
static void
menu_queue_resize (GtkMenu *menu)
gtk_menu_class_init (GtkMenuClass *class)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
GtkContainerClass *container_class = GTK_CONTAINER_CLASS (class);
GtkMenuShellClass *menu_shell_class = GTK_MENU_SHELL_CLASS (class);
gobject_class->set_property = gtk_menu_set_property;
gobject_class->get_property = gtk_menu_get_property;
- object_class->destroy = gtk_menu_destroy;
-
+ widget_class->destroy = gtk_menu_destroy;
widget_class->realize = gtk_menu_realize;
widget_class->unrealize = gtk_menu_unrealize;
widget_class->size_allocate = gtk_menu_size_allocate;
widget_class->show = gtk_menu_show;
- widget_class->expose_event = gtk_menu_expose;
+ widget_class->draw = gtk_menu_draw;
widget_class->scroll_event = gtk_menu_scroll;
widget_class->key_press_event = gtk_menu_key_press;
widget_class->button_press_event = gtk_menu_button_press;
widget_class->button_release_event = gtk_menu_button_release;
widget_class->motion_notify_event = gtk_menu_motion_notify;
widget_class->show_all = gtk_menu_show_all;
- widget_class->hide_all = gtk_menu_hide_all;
widget_class->enter_notify_event = gtk_menu_enter_notify;
widget_class->leave_notify_event = gtk_menu_leave_notify;
widget_class->style_set = gtk_menu_style_set;
widget_class->focus = gtk_menu_focus;
widget_class->can_activate_accel = gtk_menu_real_can_activate_accel;
widget_class->grab_notify = gtk_menu_grab_notify;
+ widget_class->get_preferred_width = gtk_menu_get_preferred_width;
+ widget_class->get_preferred_height = gtk_menu_get_preferred_height;
+ widget_class->get_preferred_height_for_width = gtk_menu_get_preferred_height_for_width;
container_class->remove = gtk_menu_remove;
container_class->get_child_property = gtk_menu_get_child_property;
menu_signals[MOVE_SCROLL] =
g_signal_new_class_handler (I_("move-scroll"),
- G_OBJECT_CLASS_TYPE (object_class),
+ G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_menu_real_move_scroll),
NULL, NULL,
GTK_TYPE_SCROLL_TYPE,
GTK_SCROLL_PAGE_DOWN);
- gtk_settings_install_property (g_param_spec_boolean ("gtk-can-change-accels",
- P_("Can change accelerators"),
- P_("Whether menu accelerators can be changed by pressing a key over the menu item"),
- FALSE,
- GTK_PARAM_READWRITE));
-
- gtk_settings_install_property (g_param_spec_int ("gtk-menu-popup-delay",
- P_("Delay before submenus appear"),
- P_("Minimum time the pointer must stay over a menu item before the submenu appear"),
- 0,
- G_MAXINT,
- DEFAULT_POPUP_DELAY,
- GTK_PARAM_READWRITE));
-
- gtk_settings_install_property (g_param_spec_int ("gtk-menu-popdown-delay",
- P_("Delay before hiding a submenu"),
- P_("The time before hiding a submenu when the pointer is moving towards the submenu"),
- 0,
- G_MAXINT,
- DEFAULT_POPDOWN_DELAY,
- GTK_PARAM_READWRITE));
-
g_type_class_add_private (gobject_class, sizeof (GtkMenuPrivate));
}
}
static void
-gtk_menu_destroy (GtkObject *object)
+gtk_menu_destroy (GtkWidget *widget)
{
- GtkMenu *menu = GTK_MENU (object);
+ GtkMenu *menu = GTK_MENU (widget);
GtkMenuAttachData *data;
GtkMenuPrivate *priv;
gtk_menu_remove_scroll_timeout (menu);
- data = g_object_get_data (G_OBJECT (object), attach_data_key);
+ data = g_object_get_data (G_OBJECT (widget), attach_data_key);
if (data)
gtk_menu_detach (menu);
if (menu->needs_destruction_ref_count)
{
menu->needs_destruction_ref_count = FALSE;
- g_object_ref (object);
+ g_object_ref (widget);
}
if (menu->accel_group)
priv->position_func_data_destroy = NULL;
}
- GTK_OBJECT_CLASS (gtk_menu_parent_class)->destroy (object);
+ GTK_WIDGET_CLASS (gtk_menu_parent_class)->destroy (widget);
}
static void
menu->saved_scroll_offset = menu->scroll_offset;
window = gtk_widget_get_window (menu->tearoff_window);
-
- gdk_drawable_get_size (window, &width, &height);
+ width = gdk_window_get_width (window);
+ height = gdk_window_get_height (window);
surface = gdk_window_create_similar_surface (window,
CAIRO_CONTENT_COLOR,
height);
cr = cairo_create (surface);
- /* Let's hope that function never notices we're not passing it a pixmap */
- gdk_cairo_set_source_pixmap (cr,
+ gdk_cairo_set_source_window (cr,
window,
0, 0);
cairo_paint (cr);
/* Instead of trusting the menu position function to queue a resize when the
* menu goes out of bounds, invalidate the cached size here. */
gtk_widget_queue_resize (GTK_WIDGET (menu));
- gtk_size_request_get_size (GTK_SIZE_REQUEST (menu->toplevel), &tmp_request, NULL);
+ gtk_widget_get_preferred_size (menu->toplevel, &tmp_request, NULL);
tmp_allocation.width = tmp_request.width;
tmp_allocation.height = tmp_request.height;
{
GtkRequisition requisition;
- gtk_size_request_get_size (GTK_SIZE_REQUEST (menu->tearoff_scrollbar),
- &requisition, NULL);
+ gtk_widget_get_preferred_size (menu->tearoff_scrollbar,
+ &requisition, NULL);
width += requisition.width;
}
gtk_menu_set_tearoff_state (GtkMenu *menu,
gboolean torn_off)
{
- gint width, height;
+ gint height;
GtkMenuPrivate *priv;
g_return_if_fail (GTK_IS_MENU (menu));
if (toplevel != NULL)
gtk_window_set_transient_for (GTK_WINDOW (menu->tearoff_window),
GTK_WINDOW (toplevel));
-
- menu->tearoff_hbox = gtk_hbox_new (FALSE, FALSE);
+
+ menu->tearoff_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_add (GTK_CONTAINER (menu->tearoff_window), menu->tearoff_hbox);
- gdk_drawable_get_size (gtk_widget_get_window (GTK_WIDGET (menu)),
- &width, &height);
- menu->tearoff_adjustment =
- GTK_ADJUSTMENT (gtk_adjustment_new (0,
- 0,
- priv->requested_height,
- MENU_SCROLL_STEP2,
- height/2,
- height));
+ height = gdk_window_get_height (gtk_widget_get_window (GTK_WIDGET (menu)));
+ menu->tearoff_adjustment = gtk_adjustment_new (0,
+ 0, priv->requested_height,
+ MENU_SCROLL_STEP2,
+ height/2,
+ height);
g_object_connect (menu->tearoff_adjustment,
"signal::value-changed", gtk_menu_scrollbar_changed, menu,
NULL);
- menu->tearoff_scrollbar = gtk_vscrollbar_new (menu->tearoff_adjustment);
+ menu->tearoff_scrollbar = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, menu->tearoff_adjustment);
gtk_box_pack_end (GTK_BOX (menu->tearoff_hbox),
menu->tearoff_scrollbar,
gtk_menu_reparent (menu, menu->tearoff_hbox, FALSE);
- gdk_drawable_get_size (gtk_widget_get_window (GTK_WIDGET (menu)),
- &width, NULL);
-
/* Update menu->requisition
*/
- gtk_size_request_get_size (GTK_SIZE_REQUEST (menu),
- NULL, NULL);
+ gtk_widget_get_preferred_size (GTK_WIDGET (menu),
+ NULL, NULL);
- gtk_menu_set_tearoff_hints (menu, width);
+ gtk_menu_set_tearoff_hints (menu, gdk_window_get_width (gtk_widget_get_window (GTK_WIDGET (menu))));
gtk_widget_realize (menu->tearoff_window);
gtk_menu_position (menu);
attributes.height = allocation.height;
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.visual = gtk_widget_get_visual (widget);
- attributes.colormap = gtk_widget_get_colormap (widget);
attributes.event_mask = gtk_widget_get_events (widget);
attributes.event_mask |= (GDK_EXPOSURE_MASK | GDK_KEY_PRESS_MASK |
GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK );
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+ attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
window = gdk_window_new (gtk_widget_get_parent_window (widget),
&attributes, attributes_mask);
part = avail_width / (r - l);
- gtk_size_request_get_height_for_width (GTK_SIZE_REQUEST (child), part,
- &child_min, &child_nat);
+ gtk_widget_get_preferred_height_for_width (child, part,
+ &child_min, &child_nat);
gtk_menu_item_toggle_size_request (GTK_MENU_ITEM (child), &toggle_size);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
border->x = border_width + style->xthickness + horizontal_padding;
border->y = border_width + style->ythickness + vertical_padding;
- gdk_drawable_get_size (gtk_widget_get_window (widget),
- &border->width, &border->height);
+ border->width = gdk_window_get_width (gtk_widget_get_window (widget));
+ border->height = gdk_window_get_height (gtk_widget_get_window (widget));
switch (arrow_placement)
{
*arrow_space = scroll_arrow_height - 2 * style->ythickness;
}
-static void
-gtk_menu_paint (GtkWidget *widget,
- GdkEventExpose *event)
+static gboolean
+gtk_menu_draw (GtkWidget *widget,
+ cairo_t *cr)
{
GtkMenu *menu;
GtkMenuPrivate *priv;
GdkWindow *window;
gint arrow_space;
- g_return_if_fail (GTK_IS_MENU (widget));
-
menu = GTK_MENU (widget);
priv = gtk_menu_get_private (menu);
get_arrows_visible_area (menu, &border, &upper, &lower, &arrow_space);
- if (event->window == window)
+ if (gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget)))
{
gfloat arrow_scaling;
gint arrow_size;
arrow_size = arrow_scaling * arrow_space;
gtk_paint_box (style,
- window,
+ cr,
GTK_STATE_NORMAL,
GTK_SHADOW_OUT,
- &event->area, widget, "menu",
- 0, 0, -1, -1);
+ widget, "menu",
+ 0, 0,
+ gtk_widget_get_allocated_width (widget),
+ gtk_widget_get_allocated_height (widget));
if (menu->upper_arrow_visible && !menu->tearoff_active)
{
- gtk_paint_box (style,
- window,
+ gtk_paint_box (style,
+ cr,
priv->upper_arrow_state,
GTK_SHADOW_OUT,
- &event->area, widget, "menu_scroll_arrow_up",
+ widget, "menu_scroll_arrow_up",
upper.x,
upper.y,
upper.width,
upper.height);
- gtk_paint_arrow (style,
- window,
+ gtk_paint_arrow (style,
+ cr,
priv->upper_arrow_state,
GTK_SHADOW_OUT,
- &event->area, widget, "menu_scroll_arrow_up",
+ widget, "menu_scroll_arrow_up",
GTK_ARROW_UP,
TRUE,
upper.x + (upper.width - arrow_size) / 2,
if (menu->lower_arrow_visible && !menu->tearoff_active)
{
- gtk_paint_box (style,
- window,
+ gtk_paint_box (style,
+ cr,
priv->lower_arrow_state,
GTK_SHADOW_OUT,
- &event->area, widget, "menu_scroll_arrow_down",
+ widget, "menu_scroll_arrow_down",
lower.x,
lower.y,
lower.width,
lower.height);
- gtk_paint_arrow (style,
- window,
+ gtk_paint_arrow (style,
+ cr,
priv->lower_arrow_state,
GTK_SHADOW_OUT,
- &event->area, widget, "menu_scroll_arrow_down",
+ widget, "menu_scroll_arrow_down",
GTK_ARROW_DOWN,
TRUE,
lower.x + (lower.width - arrow_size) / 2,
arrow_size, arrow_size);
}
}
- else if (event->window == menu->bin_window)
+
+ if (gtk_cairo_should_draw_window (cr, menu->bin_window))
{
gint y = -border.y + menu->scroll_offset;
+
+ cairo_save (cr);
+ gtk_cairo_transform_to_window (cr, widget, menu->bin_window);
if (!menu->tearoff_active)
{
}
gtk_paint_box (style,
- menu->bin_window,
+ cr,
GTK_STATE_NORMAL,
GTK_SHADOW_OUT,
- &event->area, widget, "menu",
+ widget, "menu",
- border.x, y,
border.width, border.height);
- }
-}
-static gboolean
-gtk_menu_expose (GtkWidget *widget,
- GdkEventExpose *event)
-{
- g_return_val_if_fail (GTK_IS_MENU (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ cairo_restore (cr);
+ }
- if (gtk_widget_is_drawable (widget))
- {
- gtk_menu_paint (widget, event);
+ GTK_WIDGET_CLASS (gtk_menu_parent_class)->draw (widget, cr);
- GTK_WIDGET_CLASS (gtk_menu_parent_class)->expose_event (widget, event);
- }
-
return FALSE;
}
}
-
-static void
-gtk_menu_size_request_init (GtkSizeRequestIface *iface)
-{
- iface->get_width = gtk_menu_get_width;
- iface->get_height = gtk_menu_get_height;
- iface->get_height_for_width = gtk_menu_get_height_for_width;
-}
-
static void
-gtk_menu_get_width (GtkSizeRequest *widget,
- gint *minimum_size,
- gint *natural_size)
+gtk_menu_get_preferred_width (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size)
{
GtkMenu *menu;
GtkMenuShell *menu_shell;
*/
GTK_MENU_ITEM (child)->show_submenu_indicator = TRUE;
- gtk_size_request_get_width (GTK_SIZE_REQUEST (child), &child_min, &child_nat);
+ gtk_widget_get_preferred_width (child, &child_min, &child_nat);
gtk_menu_item_toggle_size_request (GTK_MENU_ITEM (child), &toggle_size);
max_toggle_size = MAX (max_toggle_size, toggle_size);
}
static void
-gtk_menu_get_height (GtkSizeRequest *widget,
- gint *minimum_size,
- gint *natural_size)
+gtk_menu_get_preferred_height (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size)
{
gint min_width;
/* Menus are height-for-width only, just return the height for the minimum width */
- GTK_SIZE_REQUEST_GET_IFACE (widget)->get_width (widget, &min_width, NULL);
- GTK_SIZE_REQUEST_GET_IFACE (widget)->get_height_for_width (widget, min_width, minimum_size, natural_size);
+ GTK_WIDGET_GET_CLASS (widget)->get_preferred_width (widget, &min_width, NULL);
+ GTK_WIDGET_GET_CLASS (widget)->get_preferred_height_for_width (widget, min_width, minimum_size, natural_size);
}
static void
-gtk_menu_get_height_for_width (GtkSizeRequest *widget,
- gint for_size,
- gint *minimum_size,
- gint *natural_size)
+gtk_menu_get_preferred_height_for_width (GtkWidget *widget,
+ gint for_size,
+ gint *minimum_size,
+ gint *natural_size)
{
GtkMenu *menu = GTK_MENU (widget);
GtkMenuPrivate *private = gtk_menu_get_private (menu);
GdkWindow *window = GTK_MENU_ITEM (widget)->event_window;
int w, h;
- gdk_drawable_get_size (window, &w, &h);
+ w = gdk_window_get_width (window);
+ h = gdk_window_get_height (window);
return
check_threshold (widget, 0, 0, x, y) &&
/* The menu is now sensitive to enter events on its items, but
* was previously sensitive. So we fake an enter event.
*/
- gint width, height;
-
menu_shell->ignore_enter = FALSE;
- gdk_drawable_get_size (event->window, &width, &height);
- if (event->x >= 0 && event->x < width &&
- event->y >= 0 && event->y < height)
+ if (event->x >= 0 && event->x < gdk_window_get_width (event->window) &&
+ event->y >= 0 && event->y < gdk_window_get_height (event->window))
{
GdkEvent *send_event = gdk_event_new (GDK_ENTER_NOTIFY);
gboolean result;
GtkBorder arrow_border;
GtkWidget *widget;
gint offset;
- gint view_width, view_height;
+ gint view_height;
gboolean double_arrows;
widget = GTK_WIDGET (menu);
if ((menu->scroll_offset >= 0) && (offset < 0))
offset = 0;
- gdk_drawable_get_size (gtk_widget_get_window (widget),
- &view_width, &view_height);
+ view_height = gdk_window_get_height (gtk_widget_get_window (widget));
if (menu->scroll_offset == 0 &&
view_height >= priv->requested_height)
gint scroll_arrow_height;
window = gtk_widget_get_window (widget);
-
- gdk_drawable_get_size (window, &width, &height);
+ width = gdk_window_get_width (window);
+ height = gdk_window_get_height (window);
gtk_widget_style_get (widget,
"vertical-padding", &vertical_padding,
window = gtk_widget_get_window (menu_item->submenu);
gdk_window_get_origin (window, &submenu_left, &submenu_top);
- gdk_drawable_get_size (window, &width, &height);
- submenu_right = submenu_left + width;
- submenu_bottom = submenu_top + height;
+ submenu_right = submenu_left + gdk_window_get_width (window);
+ submenu_bottom = submenu_top + gdk_window_get_height (window);
- gdk_drawable_get_size (gtk_widget_get_window (event_widget),
- &width, &height);
+ width = gdk_window_get_width (gtk_widget_get_window (event_widget));
+ height = gdk_window_get_height (gtk_widget_get_window (event_widget));
if (event->x >= 0 && event->x < width)
{
/* Get the minimum height for minimum width to figure out
* the right place to popup the menu.
*/
- gtk_size_request_get_size (GTK_SIZE_REQUEST (widget), &requisition, NULL);
+ gtk_widget_get_preferred_size (widget, &requisition, NULL);
if (pointer_screen != screen)
{
gboolean double_arrows;
y = menu->scroll_offset;
- gdk_drawable_get_size (gtk_widget_get_window (widget),
- &width, &height);
+ width = gdk_window_get_width (gtk_widget_get_window (widget));
+ height = gdk_window_get_height (gtk_widget_get_window (widget));
gtk_widget_style_get (widget,
"vertical-padding", &vertical_padding,
GtkWidget *new_parent,
gboolean unrealize)
{
- GtkObject *object = GTK_OBJECT (menu);
+ GObject *object = G_OBJECT (menu);
GtkWidget *widget = GTK_WIDGET (menu);
gboolean was_floating = g_object_is_floating (object);
g_object_unref (object);
}
else
- gtk_widget_reparent (GTK_WIDGET (menu), new_parent);
-
+ gtk_widget_reparent (widget, new_parent);
+
if (was_floating)
- g_object_force_floating (G_OBJECT (object));
+ g_object_force_floating (object);
else
g_object_unref (object);
}
gtk_container_foreach (GTK_CONTAINER (widget), (GtkCallback) gtk_widget_show_all, NULL);
}
-
-static void
-gtk_menu_hide_all (GtkWidget *widget)
-{
- /* Hide children, but not self. */
- gtk_container_foreach (GTK_CONTAINER (widget), (GtkCallback) gtk_widget_hide_all, NULL);
-}
-
/**
* gtk_menu_set_screen:
* @menu: a #GtkMenu.
{
GtkRequisition child_requisition;
- gtk_size_request_get_size (GTK_SIZE_REQUEST (children->data),
- &child_requisition, NULL);
+ gtk_widget_get_preferred_size (children->data,
+ &child_requisition, NULL);
if (_gtk_menu_item_is_selectable (children->data) &&
child_offset >= lower &&
gtk_widget_get_allocation (widget, &allocation);
height = allocation.height;
- height -= gtk_container_get_border_width (GTK_CONTAINER (widget) + gtk_widget_get_style (widget)->ythickness) * 2;
+ height -= (gtk_container_get_border_width (GTK_CONTAINER (widget)) + gtk_widget_get_style (widget)->ythickness) * 2;
if (!menu->tearoff_active)
{
projects / ~andy / gtk / blobdiff