[gtk+/wip/attachment: 3/5] gtkmenuitem: remove gtk_menu_item_position_menu ()
- From: William Hua <williamhua src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/attachment: 3/5] gtkmenuitem: remove gtk_menu_item_position_menu ()
- Date: Wed, 16 Sep 2015 20:16:11 +0000 (UTC)
commit 5818426dd561ce15bf54ee50f0579bf242e09e22
Author: William Hua <william hua canonical com>
Date: Mon Sep 14 16:37:05 2015 -0400
gtkmenuitem: remove gtk_menu_item_position_menu ()
gtk/gtkmenuitem.c | 159 -----------------------------------------------------
1 files changed, 0 insertions(+), 159 deletions(-)
---
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 5535e6a..adb43a2 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -156,11 +156,6 @@ static gboolean gtk_menu_item_mnemonic_activate (GtkWidget *widget,
static void gtk_menu_item_ensure_label (GtkMenuItem *menu_item);
static gint gtk_menu_item_popup_timeout (gpointer data);
-static void gtk_menu_item_position_menu (GtkMenu *menu,
- gint *x,
- gint *y,
- gboolean *push_in,
- gpointer user_data);
static void gtk_menu_item_show_all (GtkWidget *widget);
static void gtk_menu_item_forall (GtkContainer *container,
gboolean include_internals,
@@ -2124,160 +2119,6 @@ _gtk_menu_item_popdown_submenu (GtkWidget *widget)
}
}
-static void
-gtk_menu_item_position_menu (GtkMenu *menu,
- gint *x,
- gint *y,
- gboolean *push_in,
- gpointer user_data)
-{
- GtkMenuItem *menu_item = GTK_MENU_ITEM (user_data);
- GtkMenuItemPrivate *priv = menu_item->priv;
- GtkAllocation allocation;
- GtkWidget *widget;
- GtkMenuItem *parent_menu_item;
- GtkWidget *parent;
- GdkScreen *screen;
- gint twidth, theight;
- gint tx, ty;
- GtkTextDirection direction;
- GdkRectangle monitor;
- gint monitor_num;
- gint horizontal_offset;
- gint vertical_offset;
- gint available_left, available_right;
- GtkStyleContext *context;
- GtkStateFlags state;
- GtkBorder parent_padding;
-
- g_return_if_fail (menu != NULL);
- g_return_if_fail (x != NULL);
- g_return_if_fail (y != NULL);
-
- widget = GTK_WIDGET (user_data);
-
- if (push_in)
- *push_in = FALSE;
-
- direction = gtk_widget_get_direction (widget);
-
- twidth = gtk_widget_get_allocated_width (GTK_WIDGET (menu));
- theight = gtk_widget_get_allocated_height (GTK_WIDGET (menu));
-
- screen = gtk_widget_get_screen (GTK_WIDGET (menu));
- monitor_num = gdk_screen_get_monitor_at_window (screen, priv->event_window);
- if (monitor_num < 0)
- monitor_num = 0;
- gdk_screen_get_monitor_workarea (screen, monitor_num, &monitor);
-
- if (!gdk_window_get_origin (gtk_widget_get_window (widget), &tx, &ty))
- {
- g_warning ("Menu not on screen");
- return;
- }
-
- gtk_widget_get_allocation (widget, &allocation);
-
- tx += allocation.x;
- ty += allocation.y;
-
- get_offsets (menu, &horizontal_offset, &vertical_offset);
-
- available_left = tx - monitor.x;
- available_right = monitor.x + monitor.width - (tx + allocation.width);
-
- parent = gtk_widget_get_parent (widget);
- priv->from_menubar = GTK_IS_MENU_BAR (parent);
-
- switch (priv->submenu_placement)
- {
- case GTK_TOP_BOTTOM:
- if (direction == GTK_TEXT_DIR_LTR)
- priv->submenu_direction = GTK_DIRECTION_RIGHT;
- else
- {
- priv->submenu_direction = GTK_DIRECTION_LEFT;
- tx += allocation.width - twidth;
- }
- if ((ty + allocation.height + theight) <= monitor.y + monitor.height)
- ty += allocation.height;
- else if ((ty - theight) >= monitor.y)
- ty -= theight;
- else if (monitor.y + monitor.height - (ty + allocation.height) > ty)
- ty += allocation.height;
- else
- ty -= theight;
- break;
-
- case GTK_LEFT_RIGHT:
- if (GTK_IS_MENU (parent))
- parent_menu_item = GTK_MENU_ITEM (GTK_MENU (parent)->priv->parent_menu_item);
- else
- parent_menu_item = NULL;
-
- context = gtk_widget_get_style_context (parent);
- state = gtk_widget_get_state_flags (parent);
- gtk_style_context_get_padding (context, state, &parent_padding);
-
- if (parent_menu_item && !GTK_MENU (parent)->priv->torn_off)
- {
- priv->submenu_direction = parent_menu_item->priv->submenu_direction;
- }
- else
- {
- if (direction == GTK_TEXT_DIR_LTR)
- priv->submenu_direction = GTK_DIRECTION_RIGHT;
- else
- priv->submenu_direction = GTK_DIRECTION_LEFT;
- }
-
- switch (priv->submenu_direction)
- {
- case GTK_DIRECTION_LEFT:
- if (tx - twidth - parent_padding.left - horizontal_offset >= monitor.x ||
- available_left >= available_right)
- tx -= twidth + parent_padding.left + horizontal_offset;
- else
- {
- priv->submenu_direction = GTK_DIRECTION_RIGHT;
- tx += allocation.width + parent_padding.right + horizontal_offset;
- }
- break;
-
- case GTK_DIRECTION_RIGHT:
- if (tx + allocation.width + parent_padding.right + horizontal_offset + twidth <= monitor.x +
monitor.width ||
- available_right >= available_left)
- tx += allocation.width + parent_padding.right + horizontal_offset;
- else
- {
- priv->submenu_direction = GTK_DIRECTION_LEFT;
- tx -= twidth + parent_padding.left + horizontal_offset;
- }
- break;
- }
-
- ty += vertical_offset;
-
- /* If the height of the menu doesn't fit we move it upward. */
- ty = CLAMP (ty, monitor.y, MAX (monitor.y, monitor.y + monitor.height - theight));
- break;
- }
-
- /* If we have negative, tx, here it is because we can't get
- * the menu all the way on screen. Favor the left portion.
- */
- *x = CLAMP (tx, monitor.x, MAX (monitor.x, monitor.x + monitor.width - twidth));
- *y = ty;
-
- gtk_menu_set_monitor (menu, monitor_num);
-
- if (!gtk_widget_get_visible (menu->priv->toplevel))
- {
- gtk_window_set_type_hint (GTK_WINDOW (menu->priv->toplevel), priv->from_menubar?
- GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU : GDK_WINDOW_TYPE_HINT_POPUP_MENU);
- }
-}
-
/**
* gtk_menu_item_set_right_justified:
* @menu_item: a #GtkMenuItem.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]