Commit 17f81739 authored by Anders Carlsson's avatar Anders Carlsson Committed by Anders Carlsson

Update xsettings name.

2001-12-09  Anders Carlsson  <andersca@gnu.org>

	* 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.
parent 0212048a
2001-12-09 Anders Carlsson <andersca@gnu.org>
* 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 <matthiasc@poet.de>
* gtk/gtkcontainer.c: Add docs.
......@@ -32,6 +42,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld <kristian@planet.nl>
* gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
per jrb's request
>>>>>>> 1.2684
2001-12-08 Anders Carlsson <andersca@gnu.org>
* tests/testgtk.c (layout_expose_handler): Don't return TRUE
......
2001-12-09 Anders Carlsson <andersca@gnu.org>
* 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 <matthiasc@poet.de>
* gtk/gtkcontainer.c: Add docs.
......@@ -32,6 +42,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld <kristian@planet.nl>
* gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
per jrb's request
>>>>>>> 1.2684
2001-12-08 Anders Carlsson <andersca@gnu.org>
* tests/testgtk.c (layout_expose_handler): Don't return TRUE
......
2001-12-09 Anders Carlsson <andersca@gnu.org>
* 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 <matthiasc@poet.de>
* gtk/gtkcontainer.c: Add docs.
......@@ -32,6 +42,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld <kristian@planet.nl>
* gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
per jrb's request
>>>>>>> 1.2684
2001-12-08 Anders Carlsson <andersca@gnu.org>
* tests/testgtk.c (layout_expose_handler): Don't return TRUE
......
2001-12-09 Anders Carlsson <andersca@gnu.org>
* 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 <matthiasc@poet.de>
* gtk/gtkcontainer.c: Add docs.
......@@ -32,6 +42,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld <kristian@planet.nl>
* gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
per jrb's request
>>>>>>> 1.2684
2001-12-08 Anders Carlsson <andersca@gnu.org>
* tests/testgtk.c (layout_expose_handler): Don't return TRUE
......
2001-12-09 Anders Carlsson <andersca@gnu.org>
* 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 <matthiasc@poet.de>
* gtk/gtkcontainer.c: Add docs.
......@@ -32,6 +42,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld <kristian@planet.nl>
* gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
per jrb's request
>>>>>>> 1.2684
2001-12-08 Anders Carlsson <andersca@gnu.org>
* tests/testgtk.c (layout_expose_handler): Don't return TRUE
......
2001-12-09 Anders Carlsson <andersca@gnu.org>
* 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 <matthiasc@poet.de>
* gtk/gtkcontainer.c: Add docs.
......@@ -32,6 +42,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld <kristian@planet.nl>
* gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
per jrb's request
>>>>>>> 1.2684
2001-12-08 Anders Carlsson <andersca@gnu.org>
* tests/testgtk.c (layout_expose_handler): Don't return TRUE
......
2001-12-09 Anders Carlsson <andersca@gnu.org>
* 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 <matthiasc@poet.de>
* gtk/gtkcontainer.c: Add docs.
......@@ -32,6 +42,7 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld <kristian@planet.nl>
* gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
per jrb's request
>>>>>>> 1.2684
2001-12-08 Anders Carlsson <andersca@gnu.org>
* tests/testgtk.c (layout_expose_handler): Don't return TRUE
......
......@@ -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" },
......
......@@ -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);
}
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment