AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

widget: Remove queue_resize_no_redraw

Browse Source 
We always invalidate the widget in size_allocate() anyway.
This commit is contained in:
Timm Bäder 2019-07-07 07:43:08 +02:00
parent 633172fd66
commit 264d4bada6
8 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4432,7 +4432,6 @@ gtk_widget_realize
gtk_widget_unrealize gtk_widget_unrealize
gtk_widget_queue_draw gtk_widget_queue_draw
gtk_widget_queue_resize gtk_widget_queue_resize
gtk_widget_queue_resize_no_redraw
gtk_widget_queue_allocate gtk_widget_queue_allocate
gtk_widget_get_frame_clock gtk_widget_get_frame_clock
gtk_widget_get_scale_factor gtk_widget_get_scale_factor

4
gtk/gtkcalendar.c
View File

@ -3474,7 +3474,7 @@ gtk_calendar_set_detail_width_chars (GtkCalendar *calendar,
{ {
priv->detail_width_chars = chars; priv->detail_width_chars = chars;
g_object_notify (G_OBJECT (calendar), "detail-width-chars"); g_object_notify (G_OBJECT (calendar), "detail-width-chars");
gtk_widget_queue_resize_no_redraw (GTK_WIDGET (calendar)); gtk_widget_queue_resize (GTK_WIDGET (calendar));
} }
} }
@ -3498,7 +3498,7 @@ gtk_calendar_set_detail_height_rows (GtkCalendar *calendar,
{ {
priv->detail_height_rows = rows; priv->detail_height_rows = rows;
g_object_notify (G_OBJECT (calendar), "detail-height-rows"); g_object_notify (G_OBJECT (calendar), "detail-height-rows");
gtk_widget_queue_resize_no_redraw (GTK_WIDGET (calendar)); gtk_widget_queue_resize (GTK_WIDGET (calendar));
} }
} }

2
gtk/gtktextview.c
View File

@ -4449,7 +4449,7 @@ changed_handler (GtkTextLayout *layout,
tmp_list = tmp_list->next; tmp_list = tmp_list->next;
} }
gtk_widget_queue_resize_no_redraw(widget); gtk_widget_queue_resize(widget);
} }
} }

8
gtk/gtktoolbar.c
View File

@ -933,13 +933,13 @@ slide_idle_handler (gpointer data)
if (cont) if (cont)
{ {
gtk_widget_queue_resize_no_redraw (GTK_WIDGET (toolbar)); gtk_widget_queue_resize (GTK_WIDGET (toolbar));
return TRUE; return TRUE;
} }
} }
gtk_widget_queue_resize_no_redraw (GTK_WIDGET (toolbar)); gtk_widget_queue_resize (GTK_WIDGET (toolbar));
priv->is_sliding = FALSE; priv->is_sliding = FALSE;
priv->idle_id = 0; priv->idle_id = 0;
@ -1052,7 +1052,7 @@ gtk_toolbar_begin_sliding (GtkToolbar *toolbar)
* so that the idle handler will not immediately return * so that the idle handler will not immediately return
* FALSE * FALSE
*/ */
gtk_widget_queue_resize_no_redraw (GTK_WIDGET (toolbar)); gtk_widget_queue_resize (GTK_WIDGET (toolbar));
g_timer_reset (priv->timer); g_timer_reset (priv->timer);
} }
@ -1086,7 +1086,7 @@ gtk_toolbar_stop_sliding (GtkToolbar *toolbar)
} }
} }
gtk_widget_queue_resize_no_redraw (GTK_WIDGET (toolbar)); gtk_widget_queue_resize (GTK_WIDGET (toolbar));
} }
} }

4
gtk/gtktreeview.c
View File

@ -6311,7 +6311,7 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
MAX (gtk_adjustment_get_upper (tree_view->priv->vadjustment), requisition.height)); MAX (gtk_adjustment_get_upper (tree_view->priv->vadjustment), requisition.height));
if (queue_resize) if (queue_resize)
gtk_widget_queue_resize_no_redraw (GTK_WIDGET (tree_view)); gtk_widget_queue_resize (GTK_WIDGET (tree_view));
} }
if (path) gtk_tree_path_free (path); if (path) gtk_tree_path_free (path);
@ -8319,7 +8319,7 @@ gtk_tree_view_row_inserted (GtkTreeModel *model,
if (node_visible && node_is_visible (tree_view, tree, tmpnode)) if (node_visible && node_is_visible (tree_view, tree, tmpnode))
gtk_widget_queue_resize (GTK_WIDGET (tree_view)); gtk_widget_queue_resize (GTK_WIDGET (tree_view));
else else
gtk_widget_queue_resize_no_redraw (GTK_WIDGET (tree_view)); gtk_widget_queue_resize (GTK_WIDGET (tree_view));
} }
else else
install_presize_handler (tree_view); install_presize_handler (tree_view);

15
gtk/gtkwidget.c
View File

@ -4161,21 +4161,6 @@ gtk_widget_queue_resize (GtkWidget *widget)
gtk_widget_queue_resize_internal (widget); gtk_widget_queue_resize_internal (widget);
} }
/**
* gtk_widget_queue_resize_no_redraw:
* @widget: a #GtkWidget
*
* This function works like gtk_widget_queue_resize(),
* except that the widget is not invalidated.
**/
void
gtk_widget_queue_resize_no_redraw (GtkWidget *widget)
{
g_return_if_fail (GTK_IS_WIDGET (widget));
gtk_widget_queue_resize_internal (widget);
}
/** /**
* gtk_widget_get_frame_clock: * gtk_widget_get_frame_clock:
* @widget: a #GtkWidget * @widget: a #GtkWidget

2
gtk/gtkwidget.h
View File

@ -375,8 +375,6 @@ void gtk_widget_queue_draw (GtkWidget *widget);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
void gtk_widget_queue_resize (GtkWidget *widget); void gtk_widget_queue_resize (GtkWidget *widget);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
void gtk_widget_queue_resize_no_redraw (GtkWidget *widget);
GDK_AVAILABLE_IN_ALL
void gtk_widget_queue_allocate (GtkWidget *widget); void gtk_widget_queue_allocate (GtkWidget *widget);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
GdkFrameClock* gtk_widget_get_frame_clock (GtkWidget *widget); GdkFrameClock* gtk_widget_get_frame_clock (GtkWidget *widget);

8
gtk/gtkwindow.c
View File

@ -4367,7 +4367,7 @@ gtk_window_set_default_size_internal (GtkWindow *window,
g_object_thaw_notify (G_OBJECT (window)); g_object_thaw_notify (G_OBJECT (window));
gtk_widget_queue_resize_no_redraw (GTK_WIDGET (window)); gtk_widget_queue_resize (GTK_WIDGET (window));
} }
/** /**
@ -4498,7 +4498,7 @@ gtk_window_resize (GtkWindow *window,
info->resize_width = width; info->resize_width = width;
info->resize_height = height; info->resize_height = height;
gtk_widget_queue_resize_no_redraw (GTK_WIDGET (window)); gtk_widget_queue_resize (GTK_WIDGET (window));
} }
/** /**
@ -7129,7 +7129,7 @@ gtk_window_move_resize (GtkWindow *window)
* to postpone our configure request until later. * to postpone our configure request until later.
*/ */
info->last = saved_last_info; info->last = saved_last_info;
gtk_widget_queue_resize_no_redraw (widget); /* might recurse for GTK_RESIZE_IMMEDIATE */ gtk_widget_queue_resize (widget); /* might recurse for GTK_RESIZE_IMMEDIATE */
} }
return; /* Bail out, we didn't really process the move/resize */ return; /* Bail out, we didn't really process the move/resize */
@ -7963,7 +7963,7 @@ gtk_window_set_resizable (GtkWindow *window,
update_window_buttons (window); update_window_buttons (window);
gtk_widget_queue_resize_no_redraw (GTK_WIDGET (window)); gtk_widget_queue_resize (GTK_WIDGET (window));
g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_RESIZABLE]); g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_RESIZABLE]);
} }