From 28d1efb96f53a94a727cde202afd81e05627d239 Mon Sep 17 00:00:00 2001
From: ROOL <code@riscosopen.org>
Date: Sat, 4 Jan 2020 17:02:27 +0000
Subject: [PATCH] Fix lost menu clicks on icons when window partly off screen
Detail:
Don't trap menu clicks on icons when the window isn't fully on-screen.
Ref https://www.riscosopen.org/forum/forums/4/topics/14961?page=1
Admin:
Submission for Clipboard Support bounty.
Version 5.68. Tagged as 'Wimp-5_68'
---
VersionASM | 8 ++++----
VersionNum | 14 +++++++-------
s/Wimp03 | 2 ++
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/VersionASM b/VersionASM
index 416d653..1ade003 100644
--- a/VersionASM
+++ b/VersionASM
@@ -9,12 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
-Module_MajorVersion SETS "5.67"
-Module_Version SETA 567
+Module_MajorVersion SETS "5.68"
+Module_Version SETA 568
Module_MinorVersion SETS ""
Module_Date SETS "04 Jan 2020"
Module_ApplicationDate SETS "04-Jan-20"
Module_ComponentName SETS "Wimp"
-Module_FullVersion SETS "5.67"
-Module_HelpVersion SETS "5.67 (04 Jan 2020)"
+Module_FullVersion SETS "5.68"
+Module_HelpVersion SETS "5.68 (04 Jan 2020)"
END
diff --git a/VersionNum b/VersionNum
index 9ee6c72..8f647ad 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,14 +1,14 @@
-/* (5.67)
+/* (5.68)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
-#define Module_MajorVersion_CMHG 5.67
+#define Module_MajorVersion_CMHG 5.68
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 04 Jan 2020
-#define Module_MajorVersion "5.67"
-#define Module_Version 567
+#define Module_MajorVersion "5.68"
+#define Module_Version 568
#define Module_MinorVersion ""
#define Module_Date "04 Jan 2020"
@@ -16,6 +16,6 @@
#define Module_ComponentName "Wimp"
-#define Module_FullVersion "5.67"
-#define Module_HelpVersion "5.67 (04 Jan 2020)"
-#define Module_LibraryVersionInfo "5:67"
+#define Module_FullVersion "5.68"
+#define Module_HelpVersion "5.68 (04 Jan 2020)"
+#define Module_LibraryVersionInfo "5:68"
diff --git a/s/Wimp03 b/s/Wimp03
index 7baa64c..2ec378e 100644
--- a/s/Wimp03
+++ b/s/Wimp03
@@ -2350,6 +2350,8 @@ justtellhim
[ CnP
CMP R4,#0
BMI %FT00 ; not over an icon, so no point checking on cnpwritable actions
+ TST R2,#2 ; menu button?
+ BNE %FT00
TST R6,#ibb_cnpwriteable
BNE mouseaction_cnpwriteable
00
--
GitLab