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

overlay: remove gtk_overlay_add_pass_through_overlay()

Browse Source 
The API to access this functionality will be the setter we just added in
the previous commit.

https://bugzilla.gnome.org/show_bug.cgi?id=750568
This commit is contained in:
Cosimo Cecchi 2015-06-16 12:02:41 -07:00
parent 3b1b171be5
commit 9c7b0f0491
4 changed files with 2 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/gtk/gtk3-sections.txt
View File

@ -7773,7 +7773,6 @@ GtkOverlayClass
gtk_overlay_new gtk_overlay_new
gtk_overlay_add_overlay gtk_overlay_add_overlay
gtk_overlay_add_pass_through_overlay
gtk_overlay_reorder_overlay gtk_overlay_reorder_overlay
gtk_overlay_get_overlay_pass_through gtk_overlay_get_overlay_pass_through
gtk_overlay_set_overlay_pass_through gtk_overlay_set_overlay_pass_through

43
gtk/gtkoverlay.c
View File

@ -948,46 +948,3 @@ gtk_overlay_get_overlay_pass_through (GtkOverlay *overlay,
return pass_through; return pass_through;
} }
/**
* gtk_overlay_add_pass_through_overlay:
* @overlay: a #GtkOverlay
* @widget: a #GtkWidget to be added to the container
*
* Adds @widget to @overlay, allowing input to fall through
* to the main child in non-interactive areas.
*
* The widget will be stacked on top of the main widget
* added with gtk_container_add().
*
* The position at which @widget is placed is determined
* from its #GtkWidget:halign and #GtkWidget:valign properties.
*
* Since: 3.18
*/
void
gtk_overlay_add_pass_through_overlay (GtkOverlay *overlay,
GtkWidget *widget)
{
GtkOverlayPrivate *priv = overlay->priv;
GtkOverlayChild *child;
g_return_if_fail (GTK_IS_OVERLAY (overlay));
g_return_if_fail (GTK_IS_WIDGET (widget));
child = g_slice_new0 (GtkOverlayChild);
child->widget = widget;
child->pass_through = TRUE;
priv->children = g_slist_append (priv->children, child);
if (gtk_widget_get_realized (GTK_WIDGET (overlay)))
{
child->window = gtk_overlay_create_child_window (overlay, child);
gtk_widget_set_parent (widget, GTK_WIDGET (overlay));
}
else
gtk_widget_set_parent (widget, GTK_WIDGET (overlay));
gtk_widget_child_notify (widget, "index");
}

3
gtk/gtkoverlay.h
View File

@ -84,9 +84,6 @@ GDK_AVAILABLE_IN_3_2
void gtk_overlay_add_overlay (GtkOverlay *overlay, void gtk_overlay_add_overlay (GtkOverlay *overlay,
GtkWidget *widget); GtkWidget *widget);
GDK_AVAILABLE_IN_3_18 GDK_AVAILABLE_IN_3_18
void gtk_overlay_add_pass_through_overlay (GtkOverlay *overlay,
GtkWidget *widget);
GDK_AVAILABLE_IN_3_18
void gtk_overlay_reorder_overlay (GtkOverlay *overlay, void gtk_overlay_reorder_overlay (GtkOverlay *overlay,
GtkWidget *child, GtkWidget *child,
gint position); gint position);

3
tests/testoverlay.c
View File

@ -440,7 +440,8 @@ test_input_stacking (void)
} }
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
gtk_overlay_add_pass_through_overlay (GTK_OVERLAY (overlay), vbox); gtk_overlay_add_overlay (GTK_OVERLAY (overlay), vbox);
gtk_overlay_set_overlay_pass_through (GTK_OVERLAY (overlay), vbox, TRUE);
gtk_widget_set_halign (vbox, GTK_ALIGN_CENTER); gtk_widget_set_halign (vbox, GTK_ALIGN_CENTER);
gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER); gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER);