From eb0e4925130ff73a727b59422909fe1b58449f13 Mon Sep 17 00:00:00 2001 From: tedjk Date: Mon, 13 Apr 2015 15:17:27 +0200 Subject: [PATCH] merged again --- juci/.#notebook.h | 1 + juci/notebook.cc | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) create mode 120000 juci/.#notebook.h diff --git a/juci/.#notebook.h b/juci/.#notebook.h new file mode 120000 index 0000000..6989c31 --- /dev/null +++ b/juci/.#notebook.h @@ -0,0 +1 @@ +forgie@surface.6435:1428916838 \ No newline at end of file diff --git a/juci/notebook.cc b/juci/notebook.cc index fdb2059..a377bea 100644 --- a/juci/notebook.cc +++ b/juci/notebook.cc @@ -188,9 +188,7 @@ bool Notebook::Controller::ScrollEventCallback(GdkEventScroll* scroll_event) { Glib::RefPtr adj = scrolledtext_vec_.at(page)-> get_vscrollbar()->get_adjustment(); - if ( direction_y != 0 ) { - int dir_val = direction_y==-1?-model_.scrollvalue_:+model_.scrollvalue_; adj->set_value(adj->get_value()+dir_val); text_vec_.at(page)->view().set_vadjustment(adj); @@ -405,8 +403,7 @@ void Notebook::Controller Gtk::TreeModel::iterator iter = directories().m_refTreeModel->get_iter(path); if(iter) { Gtk::TreeModel::Row row = *iter; - boost::filesystem::path fs_path(Glib::ustring(row[directories() - .view().m_col_path])); + boost::filesystem::path fs_path(Glib::ustring(row[directories().view().m_col_path])); if (boost::filesystem::is_directory(fs_path)) { directories().m_TreeView.row_expanded(path) ? directories().m_TreeView.collapse_row(path) :