Browse Source

push for sprint 3

merge-requests/365/head
tedjk 11 years ago
parent
commit
b4cf4174a7
  1. 5
      juci/api.cc
  2. 1
      juci/window.cc

5
juci/api.cc

@ -120,7 +120,7 @@ void libjuci::IterToWordEnd(Gtk::TextIter &iter) {
} }
Glib::RefPtr<Gtk::TextBuffer> libjuci::BufferFromNotebook() { Glib::RefPtr<Gtk::TextBuffer> libjuci::BufferFromNotebook() {
//TODO forgie: make sure it does not get the buffer to the last created textview. //finding focused view
int i = 0; int i = 0;
while(!libjuci::ApiServiceProvider::notebook_->source_vec_.at(i)->view().has_focus()) { while(!libjuci::ApiServiceProvider::notebook_->source_vec_.at(i)->view().has_focus()) {
i++; i++;
@ -131,6 +131,3 @@ Glib::RefPtr<Gtk::TextBuffer> libjuci::BufferFromNotebook() {
Gtk::TextIter libjuci::IterFromNotebook() { Gtk::TextIter libjuci::IterFromNotebook() {
return libjuci::BufferFromNotebook()->get_insert()->get_iter(); return libjuci::BufferFromNotebook()->get_insert()->get_iter();
} }

1
juci/window.cc

@ -32,6 +32,7 @@ Window::Window() :
} // Window constructor } // Window constructor
void Window::OnWindowHide(){ void Window::OnWindowHide(){
//TODO forgie: find out how to 'remove' the pointers //TODO forgie: find out how to 'remove' the pointers
//TODO forgie: Make shared_ptr
libjuci::ApiServiceProvider::notebook_ = std::shared_ptr<Notebook::Controller>(nullptr); libjuci::ApiServiceProvider::notebook_ = std::shared_ptr<Notebook::Controller>(nullptr);
libjuci::ApiServiceProvider::menu_ = std::shared_ptr<Menu::Controller>(nullptr); libjuci::ApiServiceProvider::menu_ = std::shared_ptr<Menu::Controller>(nullptr);
hide(); hide();

Loading…
Cancel
Save