Browse Source

Small fix to rename token markings.

merge-requests/365/head
eidheim 11 years ago
parent
commit
d36bbca7c0
  1. 4
      juci/source.cc
  2. 1
      juci/source.h

4
juci/source.cc

@ -905,7 +905,7 @@ Source::ClangViewAutocomplete(file_path, project_path) {
similar_tokens_tag->property_weight()=Pango::WEIGHT_BOLD; similar_tokens_tag->property_weight()=Pango::WEIGHT_BOLD;
get_buffer()->signal_changed().connect([this]() { get_buffer()->signal_changed().connect([this]() {
if(last_similar_tokens_tagged!="") { if(!renaming && last_similar_tokens_tagged!="") {
get_buffer()->remove_tag(similar_tokens_tag, get_buffer()->begin(), get_buffer()->end()); get_buffer()->remove_tag(similar_tokens_tag, get_buffer()->begin(), get_buffer()->end());
last_similar_tokens_tagged=""; last_similar_tokens_tagged="";
} }
@ -968,11 +968,13 @@ Source::ClangViewAutocomplete(file_path, project_path) {
number++; number++;
} }
for(auto &mark: marks) { for(auto &mark: marks) {
renaming=true;
get_buffer()->erase(mark.first->get_iter(), mark.second->get_iter()); get_buffer()->erase(mark.first->get_iter(), mark.second->get_iter());
get_buffer()->insert_with_tag(mark.first->get_iter(), text, similar_tokens_tag); get_buffer()->insert_with_tag(mark.first->get_iter(), text, similar_tokens_tag);
get_buffer()->delete_mark(mark.first); get_buffer()->delete_mark(mark.first);
get_buffer()->delete_mark(mark.second); get_buffer()->delete_mark(mark.second);
} }
renaming=false;
} }
return number; return number;
}; };

1
juci/source.h

@ -159,6 +159,7 @@ public:
Glib::RefPtr<Gtk::TextTag> similar_tokens_tag; Glib::RefPtr<Gtk::TextTag> similar_tokens_tag;
std::string last_similar_tokens_tagged; std::string last_similar_tokens_tagged;
std::unique_ptr<SelectionDialog> selection_dialog; std::unique_ptr<SelectionDialog> selection_dialog;
bool renaming=false;
}; };
class ClangView : public ClangViewRefactor { class ClangView : public ClangViewRefactor {

Loading…
Cancel
Save