From fa75b543c7b9da9dfd4150cef97f5b05260f2698 Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Mon, 19 Dec 2016 09:35:56 +0100
Subject: [PATCH] Minor improvements to the source right click commit

---
 src/menu.cc   | 16 ++++++++--------
 src/menu.h    |  1 +
 src/source.cc |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/menu.cc b/src/menu.cc
index e85fdab..8327c81 100644
--- a/src/menu.cc
+++ b/src/menu.cc
@@ -21,29 +21,29 @@ const Glib::ustring menu_xml= R"RAW(<interface>
         <attribute name='action'>app.edit_paste</attribute>
       </item>
     </section>
-    <section>
-      <item>
-        <attribute name='label' translatable='yes'>_Reload _File</attribute>
-        <attribute name='action'>app.reload_file</attribute>
-      </item>
-    </section>
     <section>
       <item>
         <attribute name='label' translatable='yes'>_Go _to _Declaration</attribute>
         <attribute name='action'>app.source_goto_declaration</attribute>
       </item>
       <item>
-        <attribute name='label' translatable='yes'>_Go _to _Method</attribute>
-        <attribute name='action'>app.source_goto_method</attribute>
+        <attribute name='label' translatable='yes'>_Go _to _Implementation</attribute>
+        <attribute name='action'>app.source_goto_implementation</attribute>
       </item>
       <item>
         <attribute name='label' translatable='yes'>_Go _to _Usage</attribute>
         <attribute name='action'>app.source_goto_usage</attribute>
       </item>
+      <item>
+        <attribute name='label' translatable='yes'>_Go _to _Method</attribute>
+        <attribute name='action'>app.source_goto_method</attribute>
+      </item>
       <item>
         <attribute name='label' translatable='yes'>_Rename</attribute>
         <attribute name='action'>app.source_rename</attribute>
       </item>
+    </section>
+    <section>
       <item>
         <attribute name='label' translatable='yes'>_Toggle _Line _Comment</attribute>
         <attribute name='action'>app.source_comments_toggle</attribute>
diff --git a/src/menu.h b/src/menu.h
index 6f9abd1..9d259b0 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -6,6 +6,7 @@
 #include <gtkmm.h>
 
 class Menu {
+  Menu() {}
 public:
   static Menu &get() {
     static Menu singleton;
diff --git a/src/source.cc b/src/source.cc
index 308f861..0a32b25 100644
--- a/src/source.cc
+++ b/src/source.cc
@@ -2125,6 +2125,7 @@ bool Source::View::on_button_press_event(GdkEventButton *event) {
   }
   
   if((event->type == GDK_BUTTON_PRESS) && (event->button == 3)){
+    hide_tooltips();
     if(!get_buffer()->get_has_selection()){
       int x,y;
       window_to_buffer_coords(Gtk::TextWindowType::TEXT_WINDOW_TEXT,event->x,event->y,x,y);