Merge branch 'topic/gs_36_hyperlink_locked' into 'master'

Add handler to deactivate hyperlink when changing workspace

See merge request eng/ide/gnatstudio!125

Author: AdrienBoulanger

src_editor/src/src_editor_view-hyper_mode.adb

@@ -53,6 +53,10 @@ package body Src_Editor_View.Hyper_Mode is
      (Widget : access Gtk_Widget_Record'Class;
       Event  : Gdk_Event) return Boolean;
 
+   function Toplevel_Focus_Out_Event_Cb
+     (Widget : access Gtk_Widget_Record'Class;
+      Event  : Gdk_Event) return Boolean;
+
    -----------------------
    -- Local subprograms --
    -----------------------
@@ -102,18 +106,26 @@ package body Src_Editor_View.Hyper_Mode is
       View.Hyper_Mode_Motion_Handler :=
         Return_Callback.Connect
           (View, Signal_Motion_Notify_Event,
-           Marsh => Return_Callback.To_Marshaller
-             (Motion_Notify_Event_Cb'Access),
+           Marsh =>
+             Return_Callback.To_Marshaller (Motion_Notify_Event_Cb'Access),
            After => False);
 
       --  Connect to a button press on the view
-
       View.Hyper_Mode_Button_Handler :=
         Return_Callback.Connect
           (View, Signal_Button_Press_Event,
-           Marsh => Return_Callback.To_Marshaller
-             (Button_Press_Event_Cb'Access),
+           Marsh =>
+             Return_Callback.To_Marshaller (Button_Press_Event_Cb'Access),
            After => False);
+
+      --  Monitor focus event on the toplevel
+      View.Hyper_Mode_Toplevel_Focus_Handler :=
+        Return_Callback.Object_Connect
+          (View.Get_Toplevel,
+           Signal_Focus_Out_Event,
+           Return_Callback.To_Marshaller (Toplevel_Focus_Out_Event_Cb'Access),
+           Slot_Object => View,
+           After       => False);
    end Hyper_Mode_Enter;
 
    ----------------------
@@ -160,6 +172,12 @@ package body Src_Editor_View.Hyper_Mode is
       Gtk.Handlers.Disconnect (View, View.Hyper_Mode_Button_Handler);
       View.Hyper_Mode_Button_Handler :=
         (Gtk.Handlers.Null_Handler_Id, null);
+
+      --  Disconnect the focus handler from the toplevel
+      Gtk.Handlers.Disconnect
+        (View.Get_Toplevel, View.Hyper_Mode_Toplevel_Focus_Handler);
+      View.Hyper_Mode_Toplevel_Focus_Handler :=
+        (Gtk.Handlers.Null_Handler_Id, null);
    end Hyper_Mode_Leave;
 
    -------------------------
@@ -280,4 +298,27 @@ package body Src_Editor_View.Hyper_Mode is
          return False;
    end Motion_Notify_Event_Cb;
 
+   ---------------------------------
+   -- Toplevel_Focus_Out_Event_Cb --
+   ---------------------------------
+
+   function Toplevel_Focus_Out_Event_Cb
+     (Widget : access Gtk_Widget_Record'Class;
+      Event  : Gdk_Event) return Boolean
+   is
+      pragma Unreferenced (Event);
+      View : constant Source_View := Source_View (Widget);
+   begin
+      if Active (Me) then
+         Trace (Me, "Focus Out " & Name (View));
+      end if;
+
+      Hyper_Mode_Leave (Widget);
+      return False;
+   exception
+      when E : others =>
+         Trace (Me, E);
+         return False;
+   end Toplevel_Focus_Out_Event_Cb;
+
 end Src_Editor_View.Hyper_Mode;

src_editor/src/src_editor_view.ads

@@ -375,21 +375,25 @@ private
 
       --  Handling of hyper mode
 
-      Hyper_Mode                   : Boolean := False;
+      Hyper_Mode                        : Boolean := False;
 
-      Hyper_Mode_Motion_Handler    : Gtk.Handlers.Handler_Id :=
-                                       (Gtk.Handlers.Null_Handler_Id, null);
+      Hyper_Mode_Motion_Handler         : Gtk.Handlers.Handler_Id :=
+        (Gtk.Handlers.Null_Handler_Id, null);
       --  The handler id for the callback that reacts to the motion
 
-      Hyper_Mode_Button_Handler    : Gtk.Handlers.Handler_Id :=
-                                       (Gtk.Handlers.Null_Handler_Id, null);
+      Hyper_Mode_Button_Handler         : Gtk.Handlers.Handler_Id :=
+        (Gtk.Handlers.Null_Handler_Id, null);
       --  The handler id for the callback that reacts to mouse button presses
 
-      Cursor_Needs_Change          : Boolean := False;
+      Hyper_Mode_Toplevel_Focus_Handler : Gtk.Handlers.Handler_Id :=
+        (Gtk.Handlers.Null_Handler_Id, null);
+      --  The handler id for the callback that reacts to toplevel focus out
+
+      Cursor_Needs_Change               : Boolean := False;
       --  Whether we just entered hyper mode, and the cursor aspect needs
       --  to be changed.
 
-      Source_Buffer_Handlers       : Handlers_Array (1 .. 5);
+      Source_Buffer_Handlers            : Handlers_Array (1 .. 5);
    end record;
 
 end Src_Editor_View;