From ce287c99ae15137138e2c5674f8f84a9c8bc1609 Mon Sep 17 00:00:00 2001 From: Jedidiah Barber Date: Tue, 15 Apr 2025 17:23:52 +1200 Subject: Constants marked constant, code style improvements, redundant with clauses removed --- src/windows-jump.adb | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'src/windows-jump.adb') diff --git a/src/windows-jump.adb b/src/windows-jump.adb index baa4171..13eb21c 100644 --- a/src/windows-jump.adb +++ b/src/windows-jump.adb @@ -16,9 +16,9 @@ package body Windows.Jump is (Item : in out FLTK.Widgets.Widget'Class) is type Jump_Window_Access is access all Jump_Window; - Dialog : access Jump_Window := Jump_Window_Access (Item.Parent); + Dialog : constant access Jump_Window := Jump_Window_Access (Item.Parent); - Line : Long_Integer := Dialog.To_Line.Get_Value; + Line : constant Long_Integer := Dialog.To_Line.Get_Value; begin if Dialog.Callback /= null then if Line <= 0 then @@ -37,34 +37,33 @@ package body Windows.Jump is function Create return Jump_Window is - My_Width : constant Integer := 350; - My_Height : constant Integer := 110; + My_Width : constant Integer := 350; + My_Height : constant Integer := 110; - Button_Width : constant Integer := 140; - Button_Height : constant Integer := 40; + Button_Width : constant Integer := 140; + Button_Height : constant Integer := 40; - Input_Line : constant Integer := 10; - Button_Line : constant Integer := 60; + Input_Line : constant Integer := 10; + Button_Line : constant Integer := 60; - Input_Width : constant Integer := 240; - Input_Height : constant Integer := 25; + Input_Width : constant Integer := 240; + Input_Height : constant Integer := 25; Input_Margin_Right : constant Integer := 10; begin return This : Jump_Window := - (WD.Double_Window'(WD.Forge.Create (0, 0, My_Width, My_Height, "Jump")) with - - To_Line => IT.Integer_Input'(IT.Forge.Create - (My_Width - Input_Width - Input_Margin_Right, - Input_Line, Input_Width, Input_Height, "Jump to:")), - Cancel => BU.Button'(BU.Forge.Create - ((My_Width - 2 * Button_Width) / 3, - Button_Line, Button_Width, Button_Height, "Cancel")), - Go_Jump => EN.Enter_Button'(EN.Forge.Create - ((My_Width - 2 * Button_Width) * 2 / 3 + Button_Width, - Button_Line, Button_Width, Button_Height, "Jump")), - - Callback => null) do - + (WD.Forge.Create (0, 0, My_Width, My_Height, "Jump") + with + To_Line => IT.Forge.Create + (My_Width - Input_Width - Input_Margin_Right, + Input_Line, Input_Width, Input_Height, "Jump to:"), + Cancel => BU.Forge.Create + ((My_Width - 2 * Button_Width) / 3, + Button_Line, Button_Width, Button_Height, "Cancel"), + Go_Jump => EN.Forge.Create + ((My_Width - 2 * Button_Width) * 2 / 3 + Button_Width, + Button_Line, Button_Width, Button_Height, "Jump"), + Callback => null) + do This.Add (This.To_Line); This.Add (This.Cancel); This.Cancel.Set_Callback (Hide_CB'Access); @@ -91,3 +90,4 @@ package body Windows.Jump is end Windows.Jump; + -- cgit