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

Make enable_search control only typeahead, not C-f. (#170435, Sven

Browse Source 
2005-03-30  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
	Make enable_search control only typeahead, not C-f.  (#170435,
	Sven Neumann)
	(gtk_tree_view_start_interactive_search): Pass keybinding == TRUE.
This commit is contained in:
Matthias Clasen 2005-03-30 18:20:59 +00:00 committed by Matthias Clasen
parent bf5561d2f6
commit 15ea081b5f
4 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,10 @@
2005-03-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
Make enable_search control only typeahead, not C-f. (#170435,
Sven Neumann)
(gtk_tree_view_start_interactive_search): Pass keybinding == TRUE.
* gdk/gdkpixbuf.h: Include cairo.h
* gtk/gtkclipboard.c (gtk_clipboard_set_can_store):

7
ChangeLog.pre-2-10
View File

@ -1,5 +1,10 @@
2005-03-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
Make enable_search control only typeahead, not C-f. (#170435,
Sven Neumann)
(gtk_tree_view_start_interactive_search): Pass keybinding == TRUE.
* gdk/gdkpixbuf.h: Include cairo.h
* gtk/gtkclipboard.c (gtk_clipboard_set_can_store):

7
ChangeLog.pre-2-8
View File

@ -1,5 +1,10 @@
2005-03-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
Make enable_search control only typeahead, not C-f. (#170435,
Sven Neumann)
(gtk_tree_view_start_interactive_search): Pass keybinding == TRUE.
* gdk/gdkpixbuf.h: Include cairo.h
* gtk/gtkclipboard.c (gtk_clipboard_set_can_store):

20
gtk/gtktreeview.c
View File

@ -8982,7 +8982,7 @@ gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view,
gboolean found_focus = FALSE;
GtkWidgetClass *entry_parent_class;
if (!tree_view->priv->enable_search)
if (!tree_view->priv->enable_search && !keybinding)
return FALSE;
if (GTK_WIDGET_VISIBLE (tree_view->priv->search_window))
@ -9015,9 +9015,7 @@ gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view,
gtk_tree_view_ensure_interactive_directory (tree_view);
if (keybinding)
{
gtk_entry_set_text (GTK_ENTRY (tree_view->priv->search_entry), "");
}
gtk_entry_set_text (GTK_ENTRY (tree_view->priv->search_entry), "");
/* done, show it */
tree_view->priv->search_dialog_position_func (tree_view, tree_view->priv->search_window);
@ -9029,13 +9027,11 @@ gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view,
G_CALLBACK (gtk_tree_view_search_init),
tree_view);
}
if (! keybinding)
{
tree_view->priv->typeselect_flush_timeout =
g_timeout_add (GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT,
(GSourceFunc) gtk_tree_view_search_entry_flush_timeout,
tree_view);
}
tree_view->priv->typeselect_flush_timeout =
g_timeout_add (GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT,
(GSourceFunc) gtk_tree_view_search_entry_flush_timeout,
tree_view);
/* Grab focus will select all the text. We don't want that to happen, so we
* call the parent instance and bypass the selection change. This is probably
@ -9055,7 +9051,7 @@ gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view,
static gboolean
gtk_tree_view_start_interactive_search (GtkTreeView *tree_view)
{
return gtk_tree_view_real_start_interactive_search (tree_view, FALSE);
return gtk_tree_view_real_start_interactive_search (tree_view, TRUE);
}
/* this function returns the new width of the column being resized given
* the column and x position of the cursor; the x cursor position is passed