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-about.adb | 59 ++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) (limited to 'src/windows-about.adb') diff --git a/src/windows-about.adb b/src/windows-about.adb index 8248065..b9fec99 100644 --- a/src/windows-about.adb +++ b/src/windows-about.adb @@ -14,44 +14,44 @@ package body Windows.About is function Create return About_Window is - My_Width : constant Integer := 350; - My_Height : constant Integer := 250; + My_Width : constant Integer := 350; + My_Height : constant Integer := 250; - Logo_Line : constant Integer := 30; - Logo_Width : constant Integer := 50; - Logo_Height : constant Integer := 50; + Logo_Line : constant Integer := 30; + Logo_Width : constant Integer := 50; + Logo_Height : constant Integer := 50; Button_Width : constant Integer := 140; Button_Height : constant Integer := 40; - Heading_Line : constant Integer := 90; - Blurb_Line : constant Integer := 132; - Author_Line : constant Integer := 157; - Button_Line : constant Integer := 190; + Heading_Line : constant Integer := 90; + Blurb_Line : constant Integer := 132; + Author_Line : constant Integer := 157; + Button_Line : constant Integer := 190; - Heading_Size : constant Integer := 22; - Text_Size : constant Integer := 12; + Heading_Size : constant Integer := 22; + Text_Size : constant Integer := 12; - Heading_Text : constant String := "Adapad 0.8"; - Blurb_Text : constant String := "FLTK based simple text editor written in Ada"; - Author_Text : constant String := "Programmed by Jed Barber"; + Heading_Text : constant String := "Adapad 0.8"; + Blurb_Text : constant String := "FLTK based simple text editor written in Ada"; + Author_Text : constant String := "Programmed by Jed Barber"; begin return This : About_Window := - (WD.Double_Window'(WD.Forge.Create (0, 0, My_Width, My_Height, "About Adapad")) with - - Picture => BX.Box'(BX.Forge.Create - ((My_Width - Logo_Width) / 2, - Logo_Line, Logo_Width, Logo_Height, "")), - Heading => BX.Box'(BX.Forge.Create - (0, Heading_Line, My_Width, Heading_Size, Heading_Text)), - Blurb => BX.Box'(BX.Forge.Create - (0, Blurb_Line, My_Width, Text_Size, Blurb_Text)), - Author => BX.Box'(BX.Forge.Create - (0, Author_Line, My_Width, Text_Size, Author_Text)), - Dismiss => EN.Enter_Button'(EN.Forge.Create - ((My_Width - Button_Width) / 2, - Button_Line, Button_Width, Button_Height, "Close"))) do - + (WD.Forge.Create (0, 0, My_Width, My_Height, "About Adapad") + with + Picture => BX.Forge.Create + ((My_Width - Logo_Width) / 2, + Logo_Line, Logo_Width, Logo_Height, ""), + Heading => BX.Forge.Create + (0, Heading_Line, My_Width, Heading_Size, Heading_Text), + Blurb => BX.Forge.Create + (0, Blurb_Line, My_Width, Text_Size, Blurb_Text), + Author => BX.Forge.Create + (0, Author_Line, My_Width, Text_Size, Author_Text), + Dismiss => EN.Forge.Create + ((My_Width - Button_Width) / 2, + Button_Line, Button_Width, Button_Height, "Close")) + do This.Add (This.Picture); This.Add (This.Heading); This.Heading.Set_Label_Size (FLTK.Font_Size (Heading_Size)); @@ -71,3 +71,4 @@ package body Windows.About is end Windows.About; + -- cgit