Author: nick
Date: 2007-12-08 10:31:50 +0000 (Sat, 08 Dec 2007)
New Revision: 26450
Modified:
mousepad/branches/nick_0_3/ChangeLog
mousepad/branches/nick_0_3/mousepad/mousepad-search-bar.c
mousepad/branches/nick_0_3/mousepad/mousepad-window.c
Log:
* mousepad/mousepad-{search-bar,window}.c: Remove highlight when
hiding the search bar. Search ahead when opening the search bar.
Modified: mousepad/branches/nick_0_3/ChangeLog
===================================================================
--- mousepad/branches/nick_0_3/ChangeLog 2007-12-07 23:03:25 UTC (rev
26449)
+++ mousepad/branches/nick_0_3/ChangeLog 2007-12-08 10:31:50 UTC (rev
26450)
@@ -1,3 +1,9 @@
+2007-12-08 Nick Schermer <[EMAIL PROTECTED]>
+
+ * mousepad/mousepad-{search-bar,window}.c: Remove highlight when
+ hiding the search bar. Search ahead when opening the search bar.
+
+
2007-12-07 Nick Schermer <[EMAIL PROTECTED]>
* mousepad/mousepad-search-bar.c: Fix red entry when toggling the
Modified: mousepad/branches/nick_0_3/mousepad/mousepad-search-bar.c
===================================================================
--- mousepad/branches/nick_0_3/mousepad/mousepad-search-bar.c 2007-12-07
23:03:25 UTC (rev 26449)
+++ mousepad/branches/nick_0_3/mousepad/mousepad-search-bar.c 2007-12-08
10:31:50 UTC (rev 26450)
@@ -152,7 +152,7 @@
search_bar_signals[SEARCH] =
g_signal_new (I_("search"),
G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_NO_HOOKS ,
+ G_SIGNAL_NO_HOOKS,
0, NULL, NULL,
_mousepad_marshal_INT__FLAGS_STRING_STRING,
G_TYPE_INT, 3,
@@ -514,6 +514,9 @@
/* focus the entry field */
gtk_widget_grab_focus (bar->entry);
+ /* trigger search function */
+ mousepad_search_bar_entry_changed (NULL, bar);
+
/* update the highlight */
mousepad_search_bar_highlight_schedule (bar);
}
Modified: mousepad/branches/nick_0_3/mousepad/mousepad-window.c
===================================================================
--- mousepad/branches/nick_0_3/mousepad/mousepad-window.c 2007-12-07
23:03:25 UTC (rev 26449)
+++ mousepad/branches/nick_0_3/mousepad/mousepad-window.c 2007-12-08
10:31:50 UTC (rev 26450)
@@ -2654,19 +2654,24 @@
static void
mousepad_window_hide_search_bar (MousepadWindow *window)
{
+ MousepadSearchFlags flags;
+
_mousepad_return_if_fail (MOUSEPAD_IS_WINDOW (window));
+ _mousepad_return_if_fail (MOUSEPAD_IS_DOCUMENT (window->active));
_mousepad_return_if_fail (MOUSEPAD_IS_SEARCH_BAR (window->search_bar));
+ /* setup flags */
+ flags = MOUSEPAD_SEARCH_FLAGS_ACTION_HIGHTLIGHT
+ | MOUSEPAD_SEARCH_FLAGS_ACTION_CLEANUP;
+
/* remove the highlight */
- //mousepad_search_bar_reset_highlight (MOUSEPAD_SEARCH_BAR
(window->search_bar));
- /* TODO */
+ mousepad_window_search (window, flags, NULL, NULL);
/* hide the search bar */
gtk_widget_hide (window->search_bar);
/* focus the active document's text view */
- if (G_LIKELY (window->active))
- mousepad_document_focus_textview (window->active);
+ mousepad_document_focus_textview (window->active);
}
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
