[gnome-builder/wip/chergert/perspective] terminal: drop use of GtkScrolledWindow



commit 47fee9e64db2d71252a2266c9f3b3ee129e0f405
Author: Christian Hergert <chergert redhat com>
Date:   Mon Dec 14 18:36:51 2015 -0800

    terminal: drop use of GtkScrolledWindow

 plugins/terminal/gb-terminal-view-private.h |    2 +-
 plugins/terminal/gb-terminal-view.c         |   10 +++++-----
 plugins/terminal/gb-terminal-view.ui        |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/plugins/terminal/gb-terminal-view-private.h b/plugins/terminal/gb-terminal-view-private.h
index 9d0ef63..d3326ac 100644
--- a/plugins/terminal/gb-terminal-view-private.h
+++ b/plugins/terminal/gb-terminal-view-private.h
@@ -36,7 +36,7 @@ struct _GbTerminalView
 
   gchar               *selection_buffer;
 
-  GtkWidget           *scrolled_window_bottom;
+  GtkWidget           *bottom_container;
 
   gint64               last_respawn;
 
diff --git a/plugins/terminal/gb-terminal-view.c b/plugins/terminal/gb-terminal-view.c
index 1346a94..3eec140 100644
--- a/plugins/terminal/gb-terminal-view.c
+++ b/plugins/terminal/gb-terminal-view.c
@@ -411,8 +411,8 @@ gb_terminal_set_split_view (IdeLayoutView   *view,
                                             "expand", TRUE,
                                             "visible", TRUE,
                                             NULL);
-      gtk_container_add (GTK_CONTAINER (self->scrolled_window_bottom), GTK_WIDGET (self->terminal_bottom));
-      gtk_widget_show (self->scrolled_window_bottom);
+      gtk_container_add (GTK_CONTAINER (self->bottom_container), GTK_WIDGET (self->terminal_bottom));
+      gtk_widget_show (self->bottom_container);
 
       gb_terminal_view_connect_terminal (self, self->terminal_bottom);
       style_context_changed (style_context, GB_TERMINAL_VIEW (view));
@@ -427,9 +427,9 @@ gb_terminal_set_split_view (IdeLayoutView   *view,
     }
   else
     {
-      gtk_container_remove (GTK_CONTAINER (self->scrolled_window_bottom),
+      gtk_container_remove (GTK_CONTAINER (self->bottom_container),
                             GTK_WIDGET (self->terminal_bottom));
-      gtk_widget_hide (self->scrolled_window_bottom);
+      gtk_widget_hide (self->bottom_container);
 
       self->terminal_bottom = NULL;
       self->bottom_has_focus = FALSE;
@@ -550,7 +550,7 @@ gb_terminal_view_class_init (GbTerminalViewClass *klass)
 
   gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/builder/plugins/terminal/gb-terminal-view.ui");
   gtk_widget_class_bind_template_child (widget_class, GbTerminalView, terminal_top);
-  gtk_widget_class_bind_template_child (widget_class, GbTerminalView, scrolled_window_bottom);
+  gtk_widget_class_bind_template_child (widget_class, GbTerminalView, bottom_container);
 
   g_type_ensure (VTE_TYPE_TERMINAL);
 
diff --git a/plugins/terminal/gb-terminal-view.ui b/plugins/terminal/gb-terminal-view.ui
index c0bc699..a9ad632 100644
--- a/plugins/terminal/gb-terminal-view.ui
+++ b/plugins/terminal/gb-terminal-view.ui
@@ -9,7 +9,7 @@
         <property name="orientation">vertical</property>
         <property name="visible">true</property>
         <child>
-          <object class="GtkScrolledWindow" id="scrolled_window_top">
+          <object class="GtkBox" id="top_container">
             <property name="expand">true</property>
             <property name="visible">true</property>
             <child>
@@ -26,7 +26,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkScrolledWindow" id="scrolled_window_bottom">
+          <object class="GtkBox" id="bottom_container">
             <property name="expand">true</property>
             <property name="visible">false</property>
           </object>


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