tools: clenaup

tools/level_editor/level_editor.vala

@@ -178,7 +178,6 @@ namespace Crown
 
 		// Widgets
 		private ConsoleView _console_view;
-		private bool _console_view_hidden;
 		private EngineView _engine_view;
 		private LevelTreeView _level_treeview;
 		private LevelLayersTreeView _level_layers_treeview;
@@ -249,7 +248,6 @@ namespace Crown
 			_resource_selection = new ResourceBrowser(_project, _project_store, false);
 
 			_console_view = new ConsoleView(_engine, _project);
-			_console_view_hidden = false;
 			_level_treeview = new LevelTreeView(_database, _level);
 			_level_layers_treeview = new LevelLayersTreeView(_database, _level);
 			_properties_view = new PropertiesView(_level, _project_store);
@@ -1355,15 +1353,16 @@ namespace Crown
 
 		private void on_console(Gtk.Action action)
 		{
-			if (_console_view_hidden)
+			if (_console_view.is_visible())
 			{
-				_console_view_hidden = false;
-				_console_view.show_all();
+				if (_console_view._entry.has_focus)
+					_console_view.hide();
+				else
+					_console_view._entry.grab_focus();
 			}
 			else
 			{
-				_console_view.hide();
-				_console_view_hidden = true;
+				_console_view.show_all();
 			}
 		}
 

tools/widgets/console_view.vala

@@ -50,14 +50,14 @@ namespace Crown
 	public class ConsoleView : Gtk.Box
 	{
 		// Data
-		private EntryHistory _entry_history;
-		private ConsoleClient _console_client;
-		private Project _project;
+		public EntryHistory _entry_history;
+		public ConsoleClient _console_client;
+		public Project _project;
 
 		// Widgets
-		private Gtk.ScrolledWindow _scrolled_window;
-		private Gtk.TextView _text_view;
-		private Gtk.Entry _entry;
+		public Gtk.ScrolledWindow _scrolled_window;
+		public Gtk.TextView _text_view;
+		public Gtk.Entry _entry;
 
 		public ConsoleView(ConsoleClient client, Project project)
 		{