From 17f81739f737ac9a4d31baf49ea7c06789c0fca0 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Sun, 9 Dec 2001 22:08:30 +0000 Subject: [PATCH] Update xsettings name. 2001-12-09 Anders Carlsson * gdk/x11/gdkevents-x11.c: Update xsettings name. * gtk/gtkdnd.c (gtk_drag_check_threshold): Use the gtk-dnd-drag-threshold GtkSetting. * gtk/gtksettings.c (gtk_settings_class_init): Add setting for dnd drag threshold. --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-0 | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ ChangeLog.pre-2-2 | 11 +++++++++++ ChangeLog.pre-2-4 | 11 +++++++++++ ChangeLog.pre-2-6 | 11 +++++++++++ ChangeLog.pre-2-8 | 11 +++++++++++ gdk/x11/gdkevents-x11.c | 2 +- gtk/gtkdnd.c | 10 +++++++--- gtk/gtksettings.c | 14 ++++++++++++-- 10 files changed, 97 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b450a5dcb1..16104c32f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2001-12-09 Anders Carlsson + + * gdk/x11/gdkevents-x11.c: Update xsettings name. + + * gtk/gtkdnd.c (gtk_drag_check_threshold): Use the + gtk-dnd-drag-threshold GtkSetting. + + * gtk/gtksettings.c (gtk_settings_class_init): Add + setting for dnd drag threshold. + 2001-12-09 Matthias Clasen * gtk/gtkcontainer.c: Add docs. @@ -32,6 +42,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, per jrb's request +>>>>>>> 1.2684 2001-12-08 Anders Carlsson * tests/testgtk.c (layout_expose_handler): Don't return TRUE diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b450a5dcb1..16104c32f0 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,13 @@ +2001-12-09 Anders Carlsson + + * gdk/x11/gdkevents-x11.c: Update xsettings name. + + * gtk/gtkdnd.c (gtk_drag_check_threshold): Use the + gtk-dnd-drag-threshold GtkSetting. + + * gtk/gtksettings.c (gtk_settings_class_init): Add + setting for dnd drag threshold. + 2001-12-09 Matthias Clasen * gtk/gtkcontainer.c: Add docs. @@ -32,6 +42,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, per jrb's request +>>>>>>> 1.2684 2001-12-08 Anders Carlsson * tests/testgtk.c (layout_expose_handler): Don't return TRUE diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b450a5dcb1..16104c32f0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +2001-12-09 Anders Carlsson + + * gdk/x11/gdkevents-x11.c: Update xsettings name. + + * gtk/gtkdnd.c (gtk_drag_check_threshold): Use the + gtk-dnd-drag-threshold GtkSetting. + + * gtk/gtksettings.c (gtk_settings_class_init): Add + setting for dnd drag threshold. + 2001-12-09 Matthias Clasen * gtk/gtkcontainer.c: Add docs. @@ -32,6 +42,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, per jrb's request +>>>>>>> 1.2684 2001-12-08 Anders Carlsson * tests/testgtk.c (layout_expose_handler): Don't return TRUE diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b450a5dcb1..16104c32f0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +2001-12-09 Anders Carlsson + + * gdk/x11/gdkevents-x11.c: Update xsettings name. + + * gtk/gtkdnd.c (gtk_drag_check_threshold): Use the + gtk-dnd-drag-threshold GtkSetting. + + * gtk/gtksettings.c (gtk_settings_class_init): Add + setting for dnd drag threshold. + 2001-12-09 Matthias Clasen * gtk/gtkcontainer.c: Add docs. @@ -32,6 +42,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, per jrb's request +>>>>>>> 1.2684 2001-12-08 Anders Carlsson * tests/testgtk.c (layout_expose_handler): Don't return TRUE diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b450a5dcb1..16104c32f0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +2001-12-09 Anders Carlsson + + * gdk/x11/gdkevents-x11.c: Update xsettings name. + + * gtk/gtkdnd.c (gtk_drag_check_threshold): Use the + gtk-dnd-drag-threshold GtkSetting. + + * gtk/gtksettings.c (gtk_settings_class_init): Add + setting for dnd drag threshold. + 2001-12-09 Matthias Clasen * gtk/gtkcontainer.c: Add docs. @@ -32,6 +42,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, per jrb's request +>>>>>>> 1.2684 2001-12-08 Anders Carlsson * tests/testgtk.c (layout_expose_handler): Don't return TRUE diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b450a5dcb1..16104c32f0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +2001-12-09 Anders Carlsson + + * gdk/x11/gdkevents-x11.c: Update xsettings name. + + * gtk/gtkdnd.c (gtk_drag_check_threshold): Use the + gtk-dnd-drag-threshold GtkSetting. + + * gtk/gtksettings.c (gtk_settings_class_init): Add + setting for dnd drag threshold. + 2001-12-09 Matthias Clasen * gtk/gtkcontainer.c: Add docs. @@ -32,6 +42,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, per jrb's request +>>>>>>> 1.2684 2001-12-08 Anders Carlsson * tests/testgtk.c (layout_expose_handler): Don't return TRUE diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b450a5dcb1..16104c32f0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +2001-12-09 Anders Carlsson + + * gdk/x11/gdkevents-x11.c: Update xsettings name. + + * gtk/gtkdnd.c (gtk_drag_check_threshold): Use the + gtk-dnd-drag-threshold GtkSetting. + + * gtk/gtksettings.c (gtk_settings_class_init): Add + setting for dnd drag threshold. + 2001-12-09 Matthias Clasen * gtk/gtkcontainer.c: Add docs. @@ -32,6 +42,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, per jrb's request +>>>>>>> 1.2684 2001-12-08 Anders Carlsson * tests/testgtk.c (layout_expose_handler): Don't return TRUE diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c index 8ba6d3f72c..bb62f04ad9 100644 --- a/gdk/x11/gdkevents-x11.c +++ b/gdk/x11/gdkevents-x11.c @@ -2057,7 +2057,7 @@ static struct const char *gdk_name; } settings_map[] = { { "Net/DoubleClickTime", "gtk-double-click-timeout" }, - { "Net/DragThreshold", "gtk-drag-threshold" }, + { "Net/DndDragThreshold", "gtk-dnd-drag-threshold" }, { "Gtk/ColorPalette", "gtk-color-palette" }, { "Gtk/ToolbarStyle", "gtk-toolbar-style" }, { "Gtk/ToolbarIconSize", "gtk-toolbar-icon-size" }, diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 7e4edbf85c..b1122cae7c 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -3129,8 +3129,12 @@ gtk_drag_check_threshold (GtkWidget *widget, gint current_x, gint current_y) { -#define DRAG_THRESHOLD 8 + gint drag_threshold; - return (ABS (current_x - start_x) > DRAG_THRESHOLD || - ABS (current_y - start_y) > DRAG_THRESHOLD); + g_object_get (gtk_widget_get_settings (widget), + "gtk-dnd-drag-threshold", &drag_threshold, + NULL); + + return (ABS (current_x - start_x) > drag_threshold || + ABS (current_y - start_y) > drag_threshold); } diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 6090ea2c01..2b1487eea1 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -29,7 +29,8 @@ enum { PROP_SPLIT_CURSOR, PROP_THEME_NAME, PROP_KEY_THEME_NAME, - PROP_MENU_BAR_ACCEL + PROP_MENU_BAR_ACCEL, + PROP_DND_DRAG_THRESHOLD }; @@ -197,8 +198,17 @@ gtk_settings_class_init (GtkSettingsClass *class) "F10", G_PARAM_READWRITE), NULL); - g_assert (result == PROP_MENU_BAR_ACCEL); + + result = settings_install_property_parser (class, + g_param_spec_int ("gtk-dnd-drag-threshold", + _("Drag threshold"), + _("Number of pixels the cursor can move before dragging"), + 1, G_MAXINT, 8, + G_PARAM_READWRITE), + NULL); + g_assert (result == PROP_DND_DRAG_THRESHOLD); + } static void