Browse Source

Minor cleanup

merge-requests/365/head
eidheim 10 years ago
parent
commit
97da5bd74b
  1. 15
      src/window.cc
  2. 2
      src/window.h

15
src/window.cc

@ -973,21 +973,18 @@ void Window::set_menu_actions() {
}; };
view->selection_dialog->on_hide=[this]() { view->selection_dialog->on_hide=[this]() {
if(debug_variable_tooltips) { debug_variable_tooltips.hide();
debug_variable_tooltips->hide(); debug_variable_tooltips.clear();
debug_variable_tooltips.reset();
}
}; };
view->selection_dialog->on_changed=[this, rows, iter](const std::string &selected) { view->selection_dialog->on_changed=[this, rows, iter](const std::string &selected) {
if(selected.empty()) { if(selected.empty()) {
if(debug_variable_tooltips) debug_variable_tooltips.hide();
debug_variable_tooltips->hide();
return; return;
} }
if(notebook.get_current_page()!=-1) { if(notebook.get_current_page()!=-1) {
auto view=notebook.get_current_view(); auto view=notebook.get_current_view();
debug_variable_tooltips=std::unique_ptr<Tooltips>(new Tooltips()); debug_variable_tooltips.clear();
auto create_tooltip_buffer=[this, rows, view, selected]() { auto create_tooltip_buffer=[this, rows, view, selected]() {
auto variable=rows->at(selected); auto variable=rows->at(selected);
auto tooltip_buffer=Gtk::TextBuffer::create(view->get_buffer()->get_tag_table()); auto tooltip_buffer=Gtk::TextBuffer::create(view->get_buffer()->get_tag_table());
@ -1006,9 +1003,9 @@ void Window::set_menu_actions() {
return tooltip_buffer; return tooltip_buffer;
}; };
debug_variable_tooltips->emplace_back(create_tooltip_buffer, *view, view->get_buffer()->create_mark(iter), view->get_buffer()->create_mark(iter)); debug_variable_tooltips.emplace_back(create_tooltip_buffer, *view, view->get_buffer()->create_mark(iter), view->get_buffer()->create_mark(iter));
debug_variable_tooltips->show(true); debug_variable_tooltips.show(true);
} }
}; };

2
src/window.h

@ -48,7 +48,7 @@ private:
std::mutex debug_status_mutex; std::mutex debug_status_mutex;
Glib::Dispatcher debug_update_status; Glib::Dispatcher debug_update_status;
std::unique_ptr<Tooltips> debug_variable_tooltips; Tooltips debug_variable_tooltips;
std::unique_ptr<CMake> get_cmake(); std::unique_ptr<CMake> get_cmake();
std::unordered_map<std::string, std::string> project_run_arguments; std::unordered_map<std::string, std::string> project_run_arguments;

Loading…
Cancel
Save