From 84f1ad611409b2816e3ad81f45191ca53cafcd0a Mon Sep 17 00:00:00 2001
From: Robert Sprowson <rsprowson@gitlab.riscosopen.org>
Date: Sun, 23 Feb 2025 22:42:47 +0000
Subject: [PATCH] Fix rub out issue in ResEd's gadget thumbnails

The thumbnail top and right borders would rub off when another window passed
over the top. Bottom and left borders were OK. This was caused by the Wimp's
redraw rectangle using exclusive coordinates for x,y max whereas OS_Plot uses
inclusive.
Tested in eigenfactor 0/1/2.

Version 0.46. Tagged as 'Gadgets-0_46'
---
 VersionNum   | 20 ++++++++++----------
 c/ScrollList |  4 ++--
 c/TextArea   |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/VersionNum b/VersionNum
index 76139bb..ffba6ae 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,21 +1,21 @@
-/* (0.45)
+/* (0.46)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG        0.45
+#define Module_MajorVersion_CMHG        0.46
 #define Module_MinorVersion_CMHG
-#define Module_Date_CMHG                25 Jan 2023
+#define Module_Date_CMHG                24 Mar 2025
 
-#define Module_MajorVersion             "0.45"
-#define Module_Version                  45
+#define Module_MajorVersion             "0.46"
+#define Module_Version                  46
 #define Module_MinorVersion             ""
-#define Module_Date                     "25 Jan 2023"
+#define Module_Date                     "24 Mar 2025"
 
-#define Module_ApplicationDate          "25-Jan-23"
+#define Module_ApplicationDate          "24-Mar-25"
 
 #define Module_ComponentName            "Gadgets"
 
-#define Module_FullVersion              "0.45"
-#define Module_HelpVersion              "0.45 (25 Jan 2023)"
-#define Module_LibraryVersionInfo       "0:45"
+#define Module_FullVersion              "0.46"
+#define Module_HelpVersion              "0.46 (24 Mar 2025)"
+#define Module_LibraryVersionInfo       "0:46"
diff --git a/c/ScrollList b/c/ScrollList
index b51e3d1..8266d54 100644
--- a/c/ScrollList
+++ b/c/ScrollList
@@ -1264,9 +1264,9 @@ _kernel_oserror *scrolllist_plot(ScrollList *sdata)
         return e;
 
     box.xmin = sdata->hdr.xmin;
-    box.xmax = sdata->hdr.xmax;
     box.ymin = sdata->hdr.ymin;
-    box.ymax = sdata->hdr.ymax;
+    box.xmax = sdata->hdr.xmax - 1; /* Make inclusive for OS_Plot */
+    box.ymax = sdata->hdr.ymax - 1; /* Make inclusive for OS_Plot */
     label.bbox = box;
     work_to_screen(&box, &state);
 
diff --git a/c/TextArea b/c/TextArea
index 9fdba93..8fcb125 100644
--- a/c/TextArea
+++ b/c/TextArea
@@ -464,8 +464,8 @@ _kernel_oserror *textarea_plot(TextArea *tdata)
 
     box.xmin = tdata->hdr.xmin;
     box.ymin = tdata->hdr.ymin;
-    box.xmax = tdata->hdr.xmax;
-    box.ymax = tdata->hdr.ymax;
+    box.xmax = tdata->hdr.xmax - 1; /* Make inclusive for OS_Plot */
+    box.ymax = tdata->hdr.ymax - 1; /* Make inclusive for OS_Plot */
     label.bbox = box;
     work_to_screen(&box, &state);
 
-- 
GitLab