diff options
author | Jeffrey Armstrong <jeffrey.armstrong@approximatrix.com> | 2020-09-25 14:00:19 -0400 |
---|---|---|
committer | Jeffrey Armstrong <jeffrey.armstrong@approximatrix.com> | 2020-09-25 14:00:19 -0400 |
commit | 77bb798de3e703d10c4cc6e971568ea8f80b420c (patch) | |
tree | 99b95210fc712b93423712bd6453da993b095d6e | |
parent | e302c5cfcc30aa1b2e49ad5aa1fb524871618e43 (diff) | |
download | LR-87-77bb798de3e703d10c4cc6e971568ea8f80b420c.tar.gz LR-87-77bb798de3e703d10c4cc6e971568ea8f80b420c.zip |
Fixed some rendering issues where an infinite loop could occur calculating line wrapping. Added icons on Win32.
-rw-r--r-- | ag_render.f90 | 6 | ||||
-rw-r--r-- | assets/lr87-icons.xcf | bin | 0 -> 104253 bytes | |||
-rw-r--r-- | assets/lr87.ico | bin | 0 -> 22342 bytes | |||
-rw-r--r-- | gemini-windows.prj | 7 | ||||
-rw-r--r-- | icon.rc | 3 |
5 files changed, 13 insertions, 3 deletions
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 Binary files differnew file mode 100644 index 0000000..0366bef --- /dev/null +++ b/assets/lr87-icons.xcf diff --git a/assets/lr87.ico b/assets/lr87.ico Binary files differnew file mode 100644 index 0000000..125d668 --- /dev/null +++ b/assets/lr87.ico 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" @@ -56,6 +56,9 @@ "filename":".\\history.f90", "enabled":"1" },{ + "filename":".\\icon.rc", + "enabled":"1" + },{ "filename":".\\internal.F90", "enabled":"1" },{ @@ -0,0 +1,3 @@ +#include <windows.h> + +1 ICON DISCARDABLE "assets/lr87.ico" |