AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-13 04:10:13 +00:00
Code Issues Projects Releases Wiki Activity

menu: Fix up new properties

Browse Source 
The new positioning-related properties had some quality of
implementation issues, such as incorrect initial values and
excessive change notification. This broke the notify test.
This commit is contained in:
Matthias Clasen 2016-08-02 23:42:11 -04:00
parent 5ab2b8f562
commit 2de6b0800d
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gtk/gtkmenu.c
View File

@ -784,7 +784,8 @@ gtk_menu_class_init (GtkMenuClass *class)
G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB)); G_PARAM_STATIC_BLURB |
G_PARAM_EXPLICIT_NOTIFY));
/** /**
* GtkMenu:rect-anchor-dx: * GtkMenu:rect-anchor-dx:
@ -811,7 +812,8 @@ gtk_menu_class_init (GtkMenuClass *class)
G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB)); G_PARAM_STATIC_BLURB |
G_PARAM_EXPLICIT_NOTIFY));
/** /**
* GtkMenu:rect-anchor-dy: * GtkMenu:rect-anchor-dy:
@ -837,7 +839,8 @@ gtk_menu_class_init (GtkMenuClass *class)
G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB)); G_PARAM_STATIC_BLURB |
G_PARAM_EXPLICIT_NOTIFY));
/** /**
* GtkMenu:menu-type-hint: * GtkMenu:menu-type-hint:
@ -862,7 +865,8 @@ gtk_menu_class_init (GtkMenuClass *class)
G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB)); G_PARAM_STATIC_BLURB |
G_PARAM_EXPLICIT_NOTIFY));
/** /**
* GtkMenu:horizontal-padding: * GtkMenu:horizontal-padding:
@ -1136,16 +1140,32 @@ G_GNUC_END_IGNORE_DEPRECATIONS;
gtk_menu_set_reserve_toggle_size (menu, g_value_get_boolean (value)); gtk_menu_set_reserve_toggle_size (menu, g_value_get_boolean (value));
break; break;
case PROP_ANCHOR_HINTS: case PROP_ANCHOR_HINTS:
menu->priv->anchor_hints = g_value_get_flags (value); if (menu->priv->anchor_hints != g_value_get_flags (value))
{
menu->priv->anchor_hints = g_value_get_flags (value);
g_object_notify_by_pspec (object, pspec);
}
break; break;
case PROP_RECT_ANCHOR_DX: case PROP_RECT_ANCHOR_DX:
menu->priv->rect_anchor_dx = g_value_get_int (value); if (menu->priv->rect_anchor_dx != g_value_get_int (value))
{
menu->priv->rect_anchor_dx = g_value_get_int (value);
g_object_notify_by_pspec (object, pspec);
}
break; break;
case PROP_RECT_ANCHOR_DY: case PROP_RECT_ANCHOR_DY:
menu->priv->rect_anchor_dy = g_value_get_int (value); if (menu->priv->rect_anchor_dy != g_value_get_int (value))
{
menu->priv->rect_anchor_dy = g_value_get_int (value);
g_object_notify_by_pspec (object, pspec);
}
break; break;
case PROP_MENU_TYPE_HINT: case PROP_MENU_TYPE_HINT:
menu->priv->menu_type_hint = g_value_get_enum (value); if (menu->priv->menu_type_hint != g_value_get_enum (value))
{
menu->priv->menu_type_hint = g_value_get_enum (value);
g_object_notify_by_pspec (object, pspec);
}
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -1340,6 +1360,11 @@ gtk_menu_init (GtkMenu *menu)
priv->monitor_num = -1; priv->monitor_num = -1;
priv->drag_start_y = -1; priv->drag_start_y = -1;
priv->anchor_hints = GDK_ANCHOR_FLIP | GDK_ANCHOR_SLIDE | GDK_ANCHOR_RESIZE;
priv->rect_anchor_dx = 0;
priv->rect_anchor_dy = 0;
priv->menu_type_hint = GDK_WINDOW_TYPE_HINT_POPUP_MENU;
_gtk_widget_set_captured_event_handler (GTK_WIDGET (menu), gtk_menu_captured_event); _gtk_widget_set_captured_event_handler (GTK_WIDGET (menu), gtk_menu_captured_event);
widget_node = gtk_widget_get_css_node (GTK_WIDGET (menu)); widget_node = gtk_widget_get_css_node (GTK_WIDGET (menu));