Author: Carlos Lopez <[email protected]>
Date:   Wed Nov  9 20:51:00 2011 +0100

Show the tooltip at the correct place. If tooltip query is triggered by 
keyboard, ignore it.

---

 synfig-studio/src/gui/trees/childrentree.cpp |    5 ++++-
 synfig-studio/src/gui/trees/layertree.cpp    |   10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/synfig-studio/src/gui/trees/childrentree.cpp 
b/synfig-studio/src/gui/trees/childrentree.cpp
index 8a5e03d..4da76ab 100644
--- a/synfig-studio/src/gui/trees/childrentree.cpp
+++ b/synfig-studio/src/gui/trees/childrentree.cpp
@@ -408,8 +408,10 @@ ChildrenTree::on_tree_event(GdkEvent *event)
 }
 
 bool
-ChildrenTree::on_tree_view_query_tooltip(int x, int y, bool 
/*keyboard_tooltip*/, const Glib::RefPtr<Gtk::Tooltip>& tooltip)
+ChildrenTree::on_tree_view_query_tooltip(int x, int y, bool keyboard_tooltip, 
const Glib::RefPtr<Gtk::Tooltip>& tooltip)
 {
+       if(keyboard_tooltip)
+               return false;
        Gtk::TreeModel::Path path;
        Gtk::TreeViewColumn *column;
        int cell_x, cell_y;
@@ -425,6 +427,7 @@ ChildrenTree::on_tree_view_query_tooltip(int x, int y, bool 
/*keyboard_tooltip*/
        if(tooltip_string.empty())
                return false;
        tooltip->set_text(tooltip_string);
+       get_tree_view().set_tooltip_row(tooltip, path);
        return true;
 }
 
diff --git a/synfig-studio/src/gui/trees/layertree.cpp 
b/synfig-studio/src/gui/trees/layertree.cpp
index 2ff5fa4..c836fdd 100644
--- a/synfig-studio/src/gui/trees/layertree.cpp
+++ b/synfig-studio/src/gui/trees/layertree.cpp
@@ -964,8 +964,10 @@ LayerTree::on_param_tree_event(GdkEvent *event)
 
 
 bool
-LayerTree::on_param_tree_view_query_tooltip(int x, int y, bool 
/*keyboard_tooltip*/, const Glib::RefPtr<Gtk::Tooltip>& tooltip)
+LayerTree::on_param_tree_view_query_tooltip(int x, int y, bool 
keyboard_tooltip, const Glib::RefPtr<Gtk::Tooltip>& tooltip)
 {
+       if(keyboard_tooltip)
+               return false;
        Gtk::TreeModel::Path path;
        Gtk::TreeViewColumn *column;
        int cell_x, cell_y;
@@ -981,12 +983,15 @@ LayerTree::on_param_tree_view_query_tooltip(int x, int y, 
bool /*keyboard_toolti
        if(tooltip_string.empty())
                return false;
        tooltip->set_text(tooltip_string);
+       get_param_tree_view().set_tooltip_row(tooltip, path);
        return true;
 }
 
 bool
-LayerTree::on_layer_tree_view_query_tooltip(int x, int y, bool 
/*keyboard_tooltip*/, const Glib::RefPtr<Gtk::Tooltip>& tooltip)
+LayerTree::on_layer_tree_view_query_tooltip(int x, int y, bool 
keyboard_tooltip, const Glib::RefPtr<Gtk::Tooltip>& tooltip)
 {
+       if(keyboard_tooltip)
+               return false;
        Gtk::TreeModel::Path path;
        Gtk::TreeViewColumn *column;
        int cell_x, cell_y;
@@ -1002,6 +1007,7 @@ LayerTree::on_layer_tree_view_query_tooltip(int x, int y, 
bool /*keyboard_toolti
        if(tooltip_string.empty())
                return false;
        tooltip->set_text(tooltip_string);
+       get_param_tree_view().set_tooltip_row(tooltip, path);
        return true;
 }
 


------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl

Reply via email to