From 77bb798de3e703d10c4cc6e971568ea8f80b420c Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Fri, 25 Sep 2020 14:00:19 -0400 Subject: Fixed some rendering issues where an infinite loop could occur calculating line wrapping. Added icons on Win32. --- ag_render.f90 | 6 +++++- assets/lr87-icons.xcf | Bin 0 -> 104253 bytes assets/lr87.ico | Bin 0 -> 22342 bytes gemini-windows.prj | 7 +++++-- icon.rc | 3 +++ 5 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 assets/lr87-icons.xcf create mode 100644 assets/lr87.ico create mode 100644 icon.rc diff --git a/ag_render.f90 b/ag_render.f90 index 235f3b4..7cc091e 100644 --- a/ag_render.f90 +++ b/ag_render.f90 @@ -436,6 +436,10 @@ contains DEFAULT_POSITION, DEFAULT_POSITION, & .FALSE., .FALSE.) + call setwindowsmallicon(1) + call setwindowlargeicon(1) + + call setwindowclosecallback(window_closing_callback) call registermousehandler(MOUSE_LB_UP, mouse_button_callback) call registermousehandler(MOUSE_MOVE, mouse_move_callback) @@ -725,7 +729,7 @@ contains call outtextxy(self%left_border, self%y, trim(text)) text_width = ag_link_width(self, trim(text)) - + ! Need to remove indents, borders, etc. text_width = text_width - self%left_border - self%right_border diff --git a/assets/lr87-icons.xcf b/assets/lr87-icons.xcf new file mode 100644 index 0000000..0366bef Binary files /dev/null and b/assets/lr87-icons.xcf differ diff --git a/assets/lr87.ico b/assets/lr87.ico new file mode 100644 index 0000000..125d668 Binary files /dev/null and b/assets/lr87.ico differ diff --git a/gemini-windows.prj b/gemini-windows.prj index 02dff4f..59350f4 100644 --- a/gemini-windows.prj +++ b/gemini-windows.prj @@ -2,14 +2,14 @@ "Root":{ "Folders":[{ "Folders":[], - "Name":"-samples", + "Name":"+samples", "Files":[{ "filename":".\\samples\\sample1.gmi", "enabled":"1" }] },{ "Folders":[], - "Name":"-ssl", + "Name":"+ssl", "Files":[{ "filename":".\\jessl.f90", "enabled":"1" @@ -55,6 +55,9 @@ },{ "filename":".\\history.f90", "enabled":"1" + },{ + "filename":".\\icon.rc", + "enabled":"1" },{ "filename":".\\internal.F90", "enabled":"1" diff --git a/icon.rc b/icon.rc new file mode 100644 index 0000000..a06b182 --- /dev/null +++ b/icon.rc @@ -0,0 +1,3 @@ +#include + +1 ICON DISCARDABLE "assets/lr87.ico" -- cgit v1.2.3