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

Avoid type checking overhead for resize-mode

Browse Source
This commit is contained in:
Matthias Clasen
2015-09-11 17:12:35 -04:00
parent 95cf550e15
commit 3eacfa88f2
5 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/gtkcontainer.c
View File

@ -251,25 +251,6 @@
* *
*/ */
struct _GtkContainerPrivate
{
GtkWidget *focus_child;
GdkFrameClock *resize_clock;
guint resize_handler;
guint border_width : 16;
guint border_width_set : 1;
guint has_focus_chain : 1;
guint reallocate_redraws : 1;
guint resize_pending : 1;
guint restyle_pending : 1;
guint resize_mode : 2;
guint request_mode : 2;
};
enum { enum {
ADD, ADD,
REMOVE, REMOVE,
@ -2071,7 +2052,7 @@ gtk_container_queue_resize_handler (GtkContainer *container)
GtkWidget *widget; GtkWidget *widget;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS; G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
g_return_if_fail (GTK_IS_RESIZE_CONTAINER (container)); g_return_if_fail (_GTK_IS_RESIZE_CONTAINER (container));
G_GNUC_END_IGNORE_DEPRECATIONS; G_GNUC_END_IGNORE_DEPRECATIONS;
widget = GTK_WIDGET (container); widget = GTK_WIDGET (container);
@ -2116,7 +2097,7 @@ _gtk_container_queue_resize_internal (GtkContainer *container,
_gtk_size_request_cache_clear (_gtk_widget_peek_request_cache (widget)); _gtk_size_request_cache_clear (_gtk_widget_peek_request_cache (widget));
G_GNUC_BEGIN_IGNORE_DEPRECATIONS; G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
if (((GtkContainer*)widget)->priv->resize_mode != GTK_RESIZE_PARENT) if (_GTK_IS_RESIZE_CONTAINER (container))
break; break;
G_GNUC_END_IGNORE_DEPRECATIONS; G_GNUC_END_IGNORE_DEPRECATIONS;
@ -2204,7 +2185,7 @@ gtk_container_real_check_resize (GtkContainer *container)
requisition.height > allocation.height) requisition.height > allocation.height)
{ {
G_GNUC_BEGIN_IGNORE_DEPRECATIONS; G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
if (GTK_IS_RESIZE_CONTAINER (container)) if (_GTK_IS_RESIZE_CONTAINER (container))
{ {
gtk_widget_size_allocate (widget, &allocation); gtk_widget_size_allocate (widget, &allocation);
gtk_widget_set_allocation (widget, &allocation); gtk_widget_set_allocation (widget, &allocation);

28
gtk/gtkcontainerprivate.h
View File

@ -24,6 +24,24 @@
G_BEGIN_DECLS G_BEGIN_DECLS
struct _GtkContainerPrivate
{
GtkWidget *focus_child;
GdkFrameClock *resize_clock;
guint resize_handler;
guint border_width : 16;
guint border_width_set : 1;
guint has_focus_chain : 1;
guint reallocate_redraws : 1;
guint resize_pending : 1;
guint restyle_pending : 1;
guint resize_mode : 2;
guint request_mode : 2;
};
void _gtk_container_queue_resize (GtkContainer *container); void _gtk_container_queue_resize (GtkContainer *container);
void _gtk_container_queue_restyle (GtkContainer *container); void _gtk_container_queue_restyle (GtkContainer *container);
@ -44,6 +62,16 @@ gboolean _gtk_container_get_border_width_set (GtkContainer *container);
void _gtk_container_set_border_width_set (GtkContainer *container, void _gtk_container_set_border_width_set (GtkContainer *container,
gboolean border_width_set); gboolean border_width_set);
static inline GtkResizeMode _gtk_container_get_resize_mode (GtkContainer *container);
static inline GtkResizeMode
_gtk_container_get_resize_mode (GtkContainer *container)
{
return container->priv->resize_mode;
}
#define _GTK_IS_RESIZE_CONTAINER(container) (_gtk_container_get_resize_mode (GTK_CONTAINER (container)) != GTK_RESIZE_PARENT)
G_END_DECLS G_END_DECLS
#endif /* __GTK_CONTAINER_PRIVATE_H__ */ #endif /* __GTK_CONTAINER_PRIVATE_H__ */

4
gtk/gtkcsswidgetnode.c
View File

@ -101,7 +101,7 @@ gtk_css_widget_node_queue_validate (GtkCssNode *node)
GtkCssWidgetNode *widget_node = GTK_CSS_WIDGET_NODE (node); GtkCssWidgetNode *widget_node = GTK_CSS_WIDGET_NODE (node);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (GTK_IS_RESIZE_CONTAINER (widget_node->widget)) if (_GTK_IS_RESIZE_CONTAINER (widget_node->widget))
widget_node->validate_cb_id = gtk_widget_add_tick_callback (widget_node->widget, widget_node->validate_cb_id = gtk_widget_add_tick_callback (widget_node->widget,
gtk_css_widget_node_queue_callback, gtk_css_widget_node_queue_callback,
node, node,
@ -115,7 +115,7 @@ gtk_css_widget_node_dequeue_validate (GtkCssNode *node)
GtkCssWidgetNode *widget_node = GTK_CSS_WIDGET_NODE (node); GtkCssWidgetNode *widget_node = GTK_CSS_WIDGET_NODE (node);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (GTK_IS_RESIZE_CONTAINER (widget_node->widget)) if (_GTK_IS_RESIZE_CONTAINER (widget_node->widget))
gtk_widget_remove_tick_callback (widget_node->widget, gtk_widget_remove_tick_callback (widget_node->widget,
widget_node->validate_cb_id); widget_node->validate_cb_id);
G_GNUC_END_IGNORE_DEPRECATIONS G_GNUC_END_IGNORE_DEPRECATIONS

2
gtk/gtkwidget.c
View File

@ -17223,8 +17223,6 @@ _gtk_widget_add_controller (GtkWidget *widget,
EventControllerData *data; EventControllerData *data;
GtkWidgetPrivate *priv; GtkWidgetPrivate *priv;
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (GTK_IS_EVENT_CONTROLLER (controller));
g_return_if_fail (widget == gtk_event_controller_get_widget (controller)); g_return_if_fail (widget == gtk_event_controller_get_widget (controller));
priv = widget->priv; priv = widget->priv;

4
gtk/gtkwindow.c
View File

@ -9444,7 +9444,7 @@ gtk_window_move_resize (GtkWindow *window)
gtk_widget_size_allocate (widget, &allocation); gtk_widget_size_allocate (widget, &allocation);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS; G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
if (gtk_container_get_resize_mode (container) == GTK_RESIZE_QUEUE) if (_gtk_container_get_resize_mode (container) == GTK_RESIZE_QUEUE)
gtk_widget_queue_draw (widget); gtk_widget_queue_draw (widget);
G_GNUC_END_IGNORE_DEPRECATIONS; G_GNUC_END_IGNORE_DEPRECATIONS;
} }
@ -9471,7 +9471,7 @@ gtk_window_move_resize (GtkWindow *window)
* we handle those ourselves upon ->configure_notify_received==TRUE. * we handle those ourselves upon ->configure_notify_received==TRUE.
*/ */
G_GNUC_BEGIN_IGNORE_DEPRECATIONS; G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
if (gtk_container_get_resize_mode (container) == GTK_RESIZE_QUEUE) if (_gtk_container_get_resize_mode (container) == GTK_RESIZE_QUEUE)
{ {
gtk_widget_queue_resize_no_redraw (widget); gtk_widget_queue_resize_no_redraw (widget);
_gtk_container_dequeue_resize_handler (container); _gtk_container_dequeue_resize_handler (container);