aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Armstrong <jeffrey.armstrong@approximatrix.com>2020-09-25 14:00:19 -0400
committerJeffrey Armstrong <jeffrey.armstrong@approximatrix.com>2020-09-25 14:00:19 -0400
commit77bb798de3e703d10c4cc6e971568ea8f80b420c (patch)
tree99b95210fc712b93423712bd6453da993b095d6e
parente302c5cfcc30aa1b2e49ad5aa1fb524871618e43 (diff)
downloadLR-87-77bb798de3e703d10c4cc6e971568ea8f80b420c.zip
LR-87-77bb798de3e703d10c4cc6e971568ea8f80b420c.tar.gz
Fixed some rendering issues where an infinite loop could occur calculating line wrapping. Added icons on Win32.
-rw-r--r--ag_render.f906
-rw-r--r--assets/lr87-icons.xcfbin0 -> 104253 bytes
-rw-r--r--assets/lr87.icobin0 -> 22342 bytes
-rw-r--r--gemini-windows.prj7
-rw-r--r--icon.rc3
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
new file mode 100644
index 0000000..0366bef
--- /dev/null
+++ b/assets/lr87-icons.xcf
Binary files differ
diff --git a/assets/lr87.ico b/assets/lr87.ico
new file mode 100644
index 0000000..125d668
--- /dev/null
+++ b/assets/lr87.ico
Binary files 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"
@@ -56,6 +56,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 <windows.h>
+
+1 ICON DISCARDABLE "assets/lr87.ico"