debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only setup drag scrolling events if touchscreen mode is set

Browse source 
We assume that touchscreen mode is ususally always set or never set,
so we can avoid the overhead.
This commit is contained in:
Christian Dywan 2009-10-15 23:47:00 +02:00
parent 35f032a1a4
commit c64a4334f6
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
katze/katze-scrolled.c
View file

@ -778,7 +778,6 @@ katze_scrolled_event_handler (GdkEvent* event,
stop_propagating = button_release_event (current_widget, &event->button, current_scrolled_window); stop_propagating = button_release_event (current_widget, &event->button, current_scrolled_window);
} }
if (!stop_propagating) if (!stop_propagating)
katze_scrolled_event_handler_next (event, state); katze_scrolled_event_handler_next (event, state);
@ -885,10 +884,15 @@ katze_scrolled_dispose (GObject* object)
static void static void
katze_scrolled_class_init (KatzeScrolledClass* class) katze_scrolled_class_init (KatzeScrolledClass* class)
{ {
GObjectClass* gobject_class = G_OBJECT_CLASS (class); GObjectClass* gobject_class;
GtkWidgetClass* widget_class = GTK_WIDGET_CLASS (class); GtkWidgetClass* widget_class;
GtkContainerClass* container_class = GTK_CONTAINER_CLASS (class); GtkContainerClass* container_class;
GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT;
GtkSettings* gtk_settings;
gobject_class = G_OBJECT_CLASS (class);
widget_class = GTK_WIDGET_CLASS (class);
container_class = GTK_CONTAINER_CLASS (class);
gobject_class->set_property = katze_scrolled_set_property; gobject_class->set_property = katze_scrolled_set_property;
gobject_class->get_property = katze_scrolled_get_property; gobject_class->get_property = katze_scrolled_get_property;
@ -938,7 +942,15 @@ katze_scrolled_class_init (KatzeScrolledClass* class)
activated_widgets = g_tree_new ((GCompareFunc)compare_pointers); activated_widgets = g_tree_new ((GCompareFunc)compare_pointers);
current_gdk_window = NULL; current_gdk_window = NULL;
katze_scrolled_event_handler_append (katze_scrolled_event_handler, NULL); /* Usually touchscreen mode is either always set or it isn't, so it
should be a safe optimization to not setup events if not needed. */
if ((gtk_settings = gtk_settings_get_default ()))
{
gboolean touchscreen;
g_object_get (gtk_settings, "gtk-touchscreen-mode", &touchscreen, NULL);
if (touchscreen)
katze_scrolled_event_handler_append (katze_scrolled_event_handler, NULL);
}
g_type_class_add_private (class, sizeof (KatzeScrolledPrivate)); g_type_class_add_private (class, sizeof (KatzeScrolledPrivate));
} }