[gnome-builder] editor-frame: style cleanup



commit c3945b7cd74fb803e827841c33f340856ea88a8f
Author: Christian Hergert <christian hergert me>
Date:   Sat May 9 12:07:25 2015 -0700

    editor-frame: style cleanup

 src/editor/gb-editor-frame-actions.c |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/src/editor/gb-editor-frame-actions.c b/src/editor/gb-editor-frame-actions.c
index 955c803..e890816 100644
--- a/src/editor/gb-editor-frame-actions.c
+++ b/src/editor/gb-editor-frame-actions.c
@@ -27,31 +27,36 @@ gb_editor_frame_actions_find (GSimpleAction *action,
                               gpointer       user_data)
 {
   GbEditorFrame *self = user_data;
-  GtkTextIter start_sel, end_sel;
   GtkTextBuffer *buffer;
+  GtkTextIter start_sel;
+  GtkTextIter end_sel;
 
-  gchar *selected_text;
   g_assert (GB_IS_EDITOR_FRAME (self));
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->source_view));
 
-  if (gtk_text_buffer_get_has_selection (buffer))
-  {
-    gtk_text_buffer_get_selection_bounds (buffer, &start_sel, &end_sel);
+  /*
+   * If the buffer currently has a selection, we prime the search entry with the
+   * selected text. If not, we use our previous search text in the case that it was
+   * cleared by the IdeSourceView internal state.
+   */
 
-    if(gtk_text_iter_get_line (&start_sel) == gtk_text_iter_get_line (&end_sel))
+  if (gtk_text_buffer_get_has_selection (buffer))
     {
-      selected_text = gtk_text_buffer_get_text(buffer, &start_sel, &end_sel, FALSE);
-      gtk_entry_set_text (GTK_ENTRY (self->search_entry), selected_text);
+      gtk_text_buffer_get_selection_bounds (buffer, &start_sel, &end_sel);
+
+      if (gtk_text_iter_get_line (&start_sel) == gtk_text_iter_get_line (&end_sel))
+        {
+          const gchar *selected_text;
+
+          selected_text = gtk_text_buffer_get_text (buffer, &start_sel, &end_sel, FALSE);
+          gtk_entry_set_text (GTK_ENTRY (self->search_entry), selected_text);
+        }
     }
-  }
-  else
-  {
-    if(self->previous_search_string != NULL)
+  else if (self->previous_search_string != NULL)
     {
       gtk_entry_set_text (GTK_ENTRY (self->search_entry), self->previous_search_string);
     }
-  }
 
   gtk_revealer_set_reveal_child (self->search_revealer, TRUE);
   gtk_widget_grab_focus (GTK_WIDGET (self->search_entry));


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]