From 2ac04c15a5cd079c76bd32d4061e3c67b46b5fd4 Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Wed, 21 Oct 2015 09:56:26 +0200
Subject: [PATCH] Now stores the last tab when opening a new one such that
 notebook returns to the previous tab after closing the new tab, if no other
 tab-operations have happened. Like what happens in for instance Chrome.

---
 src/notebook.cc | 17 ++++++++++++++++-
 src/notebook.h  |  2 ++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/notebook.cc b/src/notebook.cc
index 4cf8d7d..445756a 100644
--- a/src/notebook.cc
+++ b/src/notebook.cc
@@ -27,8 +27,12 @@ namespace sigc {
 #endif
 }
 
-Notebook::Notebook() : Gtk::Notebook() {
+Notebook::Notebook() : Gtk::Notebook(), last_index(-1) {
   Gsv::init();
+  
+  signal_switch_page().connect([this](Gtk::Widget* page, guint page_num) {
+    last_index=-1;
+  });
 }
 
 int Notebook::size() {
@@ -114,7 +118,13 @@ void Notebook::open(const boost::filesystem::path &file_path) {
   
   set_tab_reorderable(*hboxes.back(), true);
   show_all_children();
+  
+  size_t last_index_tmp=-1;
+  if(get_current_page()!=-1)
+    last_index_tmp=get_index(get_current_page());
   set_current_page(size()-1);
+  last_index=last_index_tmp;
+  
   set_focus_child(*source_views.back());
   get_current_view()->get_buffer()->set_modified(false);
   get_current_view()->grab_focus();
@@ -229,6 +239,11 @@ bool Notebook::close_current_page() {
     }
     int page = get_current_page();
     int index=get_index(page);
+    
+    if(last_index!=-1) {
+      set_current_page(page_num(*hboxes.at(last_index)));
+      last_index=-1;
+    }
     remove_page(page);
 #if GTK_VERSION_GE(3, 18)
     source_maps.erase(source_maps.begin()+index);
diff --git a/src/notebook.h b/src/notebook.h
index 12388ed..00892bb 100644
--- a/src/notebook.h
+++ b/src/notebook.h
@@ -29,5 +29,7 @@ private:
   std::vector<std::unique_ptr<Gtk::Widget> > source_maps;
   std::vector<std::unique_ptr<Gtk::ScrolledWindow> > scrolled_windows;
   std::vector<std::unique_ptr<Gtk::HBox> > hboxes;
+  
+  size_t last_index;
 };
 #endif  // JUCI_NOTEBOOK_H_