adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.0.0557: GTK: using static gravities is not useful

Browse Source 
Problem:    GTK: using static gravities is not useful.
Solution:   Remove setting static gravities. (Kazunobu Kuriyama)
This commit is contained in:
Bram Moolenaar
2017-04-09 15:27:09 +02:00
parent 7860bac57b
commit 59053e1d9f
2 changed files with 2 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/gui_gtk_f.c
View File

@ -92,11 +92,6 @@ static void gtk_form_position_child(GtkForm *form,
gboolean force_allocate); gboolean force_allocate);
static void gtk_form_position_children(GtkForm *form); static void gtk_form_position_children(GtkForm *form);
#if !GTK_CHECK_VERSION(3,16,0)
static void gtk_form_set_static_gravity(GdkWindow *window,
gboolean use_static);
#endif
static void gtk_form_send_configure(GtkForm *form); static void gtk_form_send_configure(GtkForm *form);
static void gtk_form_child_map(GtkWidget *widget, gpointer user_data); static void gtk_form_child_map(GtkWidget *widget, gpointer user_data);
@ -370,10 +365,6 @@ gtk_form_realize(GtkWidget *widget)
#endif #endif
gdk_window_set_user_data(form->bin_window, widget); gdk_window_set_user_data(form->bin_window, widget);
#if !GTK_CHECK_VERSION(3,16,0)
gtk_form_set_static_gravity(form->bin_window, TRUE);
#endif
#if GTK_CHECK_VERSION(3,0,0) #if GTK_CHECK_VERSION(3,0,0)
{ {
GtkStyleContext * const sctx = gtk_widget_get_style_context(widget); GtkStyleContext * const sctx = gtk_widget_get_style_context(widget);
@ -845,9 +836,6 @@ gtk_form_attach_child_window(GtkForm *form, GtkFormChild *child)
#endif #endif
gtk_widget_set_parent_window(child->widget, child->window); gtk_widget_set_parent_window(child->widget, child->window);
#if !GTK_CHECK_VERSION(3,16,0)
gtk_form_set_static_gravity(child->window, TRUE);
#endif
/* /*
* Install signal handlers to map/unmap child->window * Install signal handlers to map/unmap child->window
* alongside with the actual widget. * alongside with the actual widget.
@ -879,15 +867,6 @@ gtk_form_realize_child(GtkForm *form, GtkFormChild *child)
{ {
gtk_form_attach_child_window(form, child); gtk_form_attach_child_window(form, child);
gtk_widget_realize(child->widget); gtk_widget_realize(child->widget);
#if !GTK_CHECK_VERSION(3,16,0)
if (child->window == NULL) /* might be already set, see above */
# if GTK_CHECK_VERSION(3,0,0)
gtk_form_set_static_gravity(gtk_widget_get_window(child->widget), TRUE);
# else
gtk_form_set_static_gravity(child->widget->window, TRUE);
# endif
#endif
} }
static void static void
@ -999,16 +978,6 @@ gtk_form_position_children(GtkForm *form)
gtk_form_position_child(form, tmp_list->data, FALSE); gtk_form_position_child(form, tmp_list->data, FALSE);
} }
#if !GTK_CHECK_VERSION(3,16,0)
static void
gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
{
/* We don't check if static gravity is actually supported, because it
* results in an annoying assertion error message. */
gdk_window_set_static_gravities(window, use_static);
}
#endif /* !GTK_CHECK_VERSION(3,16,0) */
void void
gtk_form_move_resize(GtkForm *form, GtkWidget *widget, gtk_form_move_resize(GtkForm *form, GtkWidget *widget,
gint x, gint y, gint w, gint h) gint x, gint y, gint w, gint h)

2
src/version.c
View File

@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
557,
/**/ /**/
556, 556,
/**/ /**/