[gnote] Consider tag active only when it applies to the whole selection

[Aurimas Černius <aurimasc src gnome org>]

commit 6dcc2dee6b309ebf9074504f2697f5436f0986f6
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sat Apr 2 12:38:29 2016 +0300

    Consider tag active only when it applies to the whole selection
    
    If tag is active not on all parts of selection, consider it inactive and
    toggle it accordingly.
    Fixes Bug 702248.

 src/notebuffer.cpp |   23 ++++++++++++++++++++---
 src/notebuffer.hpp |    3 ++-
 2 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/src/notebuffer.cpp b/src/notebuffer.cpp
index 81a2703..0192259 100644
--- a/src/notebuffer.cpp
+++ b/src/notebuffer.cpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2010-2015 Aurimas Cernius
+ * Copyright (C) 2010-2016 Aurimas Cernius
  * Copyright (C) 2009 Hubert Figuiere
  *
  * This program is free software: you can redistribute it and/or modify
@@ -100,7 +100,7 @@ namespace gnote {
       if (find_depth_tag(select_start))
         select_start.set_line_offset(2);
 
-      if (select_start.begins_tag(tag) || select_start.has_tag(tag)) {
+      if(is_active_tag(tag)) {
         remove_tag(tag, select_start, select_end);
       }
       else {
@@ -219,6 +219,12 @@ namespace gnote {
   bool NoteBuffer::is_active_tag(const std::string & tag_name)
   {
     Glib::RefPtr<Gtk::TextTag> tag = get_tag_table()->lookup(tag_name);
+    return is_active_tag(tag);
+  }
+
+
+  bool NoteBuffer::is_active_tag(const Glib::RefPtr<Gtk::TextTag> & tag)
+  {
     Gtk::TextIter iter, select_end;
 
     if (get_selection_bounds (iter, select_end)) {
@@ -227,7 +233,18 @@ namespace gnote {
       if (find_depth_tag(iter)) {
         iter.forward_chars(2);
       }
-      return iter.begins_tag(tag) || iter.has_tag(tag);
+      if(iter.begins_tag(tag) || iter.has_tag(tag)) {
+        // consider tag active only if it applies to the entire selection
+        if (iter.forward_to_tag_toggle(tag)) {
+          return select_end <= iter;
+        }
+        else {
+          // probably reached the end of note
+          return true;
+        }
+      }
+
+      return false;
     } 
     else {
       return (find(m_active_tags.begin(), m_active_tags.end(), tag) != m_active_tags.end());
diff --git a/src/notebuffer.hpp b/src/notebuffer.hpp
index 131e495..dc69301 100644
--- a/src/notebuffer.hpp
+++ b/src/notebuffer.hpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2011-2015 Aurimas Cernius
+ * Copyright (C) 2011-2016 Aurimas Cernius
  * Copyright (C) 2009 Hubert Figuiere
  *
  * This program is free software: you can redistribute it and/or modify
@@ -81,6 +81,7 @@ public:
   void on_tag_applied(const Glib::RefPtr<Gtk::TextTag> &,
                       const Gtk::TextIter &,const Gtk::TextIter &);
   bool is_active_tag(const std::string & );
+  bool is_active_tag(const Glib::RefPtr<Gtk::TextTag> & tag);
   bool is_bulleted_list_active();
   bool is_bulleted_list_active(Gtk::TextIter iter);
   bool can_make_bulleted_list();