From ba90344080c6b44203e46b23e7e3d0632c6847cf Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Thu, 13 Oct 2022 16:08:28 -0700 Subject: [PATCH] MODERNIZE: Fix bug in MODERNWINDOW (Issue #972 ) (#976) --- .gitignore | 1 + lispusers/MODERNIZE | 41 ++++++++++++++++++++------------------- lispusers/MODERNIZE.LCOM | Bin 10948 -> 10915 bytes 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 484aacf1..6152db91 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ core # Mac OS detritus .DS_Store +*.PS diff --git a/lispusers/MODERNIZE b/lispusers/MODERNIZE index 514ef065..09e99137 100644 --- a/lispusers/MODERNIZE +++ b/lispusers/MODERNIZE @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 5-Mar-2022 23:20:21"  -{DSK}kaplan>Local>medley3.5>my-medley>lispusers>MODERNIZE.;40 30674 +(FILECREATED " 7-Oct-2022 21:45:29"  +{DSK}kaplan>Local>medley3.5>working-medley>lispusers>MODERNIZE.;43 30755 - :CHANGES-TO (FNS MODERNWINDOW.BUTTONEVENTFN) + :CHANGES-TO (FNS MODERNWINDOW) - :PREVIOUS-DATE "25-Dec-2021 22:27:41" -{DSK}kaplan>Local>medley3.5>my-medley>lispusers>MODERNIZE.;39) + :PREVIOUS-DATE " 5-Mar-2022 23:20:21" +{DSK}kaplan>Local>medley3.5>working-medley>lispusers>MODERNIZE.;40) (PRETTYCOMPRINT MODERNIZECOMS) @@ -104,11 +104,12 @@ (DEFINEQ (MODERNWINDOW - [LAMBDA (WINDOW ANYWHERE TITLEPROPORTION) (* ; "Edited 8-Jul-2021 23:33 by rmk:") - (* ; "Edited 3-Jul-2021 10:31 by rmk:") - (* ; "Edited 24-Jun-2021 14:52 by rmk:") + [LAMBDA (WINDOW ANYWHERE TITLEPROPORTION) (* ; "Edited 7-Oct-2022 21:45 by rmk") + (* ; "Edited 8-Jul-2021 23:33 by rmk:") + (* ; "Edited 3-Jul-2021 10:31 by rmk:") + (* ; "Edited 24-Jun-2021 14:52 by rmk:") - (* ;; "This can be applied to windows that have been created with an unknown or unmodifiable buttoneventfn. If the window was previously modernized, we restore its original state first, in case it is called here with different parameters") + (* ;; "This can be applied to windows that have been created with an unknown or unmodifiable buttoneventfn. If the window was previously modernized, we restore its original state first, in case it is called here with different parameters") (CL:WHEN (AND TITLEPROPORTION (GREATERP TITLEPROPORTION 0.5)) (ERROR "TITLEPROPORTION cannot be greater than .5")) @@ -117,9 +118,9 @@ (WINDOWPROP WINDOW 'PREMODERN-BUTTONEVENTFN NIL)) (WINDOWPROP WINDOW 'PREMODERN-BUTTONEVENTFN (WINDOWPROP WINDOW 'BUTTONEVENTFN)) (WINDOWPROP WINDOW 'BUTTONEVENTFN (IF (OR ANYWHERE TITLEPROPORTION) - THEN [FUNCTION (LAMBDA (WINDOW) - (MODERNWINDOW.BUTTONEVENTFN - WINDOW NIL T ,TITLEPROPORTION] + THEN `[LAMBDA (WINDOW) + (MODERNWINDOW.BUTTONEVENTFN WINDOW NIL T + ',TITLEPROPORTION] ELSE (FUNCTION MODERNWINDOW.BUTTONEVENTFN))) WINDOW]) @@ -613,12 +614,12 @@ (ADDTOVAR LAMA MODERN-ADD-EXEC) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (5129 11406 (MODERNWINDOW 5139 . 6594) (MODERNWINDOW.SETUP 6596 . 9545) (UNMODERNWINDOW -9547 . 9941) (MODERNWINDOW.UNSETUP 9943 . 10755) (\MODERNIZED.FREEMENU.BUTTONEVENTFN 10757 . 11404)) ( -11471 21633 (MODERNWINDOW.BUTTONEVENTFN 11481 . 18508) (NEARTOP 18510 . 19438) (NEARESTCORNER 19440 . -20319) (INCORNER.REGION 20321 . 21631)) (21691 24163 (MODERN-ADD-EXEC 21701 . 22132) (MODERN-SNAPW -22134 . 22677) (TOTOPW.MODERNIZE 22679 . 23107) (MODERN-MENUBUTTONFN 23109 . 24161)) (24164 26593 ( -\MODERNIZED.FREEMENU.BUTTONEVENTFN 24174 . 24821) (MODERNIZED.TB.BUTTONEVENTFN 24823 . 26591)) (26634 -28913 (TEDIT.MODERNIZE 26644 . 27458) (\MODERNIZED.TEDIT.BUTTONEVENTFN 27460 . 28582) (TEDIT.SELECTALL - 28584 . 28911))))) + (FILEMAP (NIL (5125 11487 (MODERNWINDOW 5135 . 6675) (MODERNWINDOW.SETUP 6677 . 9626) (UNMODERNWINDOW +9628 . 10022) (MODERNWINDOW.UNSETUP 10024 . 10836) (\MODERNIZED.FREEMENU.BUTTONEVENTFN 10838 . 11485)) + (11552 21714 (MODERNWINDOW.BUTTONEVENTFN 11562 . 18589) (NEARTOP 18591 . 19519) (NEARESTCORNER 19521 + . 20400) (INCORNER.REGION 20402 . 21712)) (21772 24244 (MODERN-ADD-EXEC 21782 . 22213) (MODERN-SNAPW +22215 . 22758) (TOTOPW.MODERNIZE 22760 . 23188) (MODERN-MENUBUTTONFN 23190 . 24242)) (24245 26674 ( +\MODERNIZED.FREEMENU.BUTTONEVENTFN 24255 . 24902) (MODERNIZED.TB.BUTTONEVENTFN 24904 . 26672)) (26715 +28994 (TEDIT.MODERNIZE 26725 . 27539) (\MODERNIZED.TEDIT.BUTTONEVENTFN 27541 . 28663) (TEDIT.SELECTALL + 28665 . 28992))))) STOP diff --git a/lispusers/MODERNIZE.LCOM b/lispusers/MODERNIZE.LCOM index b6273ed8907694ef2b6ff385bee47ab14786d2f6..35b9aac7121dd84cc19316bfc04facba6dd9bbb9 100644 GIT binary patch delta 480 zcmX>Sx;S(~gs{1;e{zYgk%5tsf{~$>iK&&5<-}|=_VWCq?99CM$-Rtn62_VeN(xBo z3{9;JjIB(~Cf-zzR>;g#P;v|P@lillp{J*(q>z$WlA404)5OZaKuMEJ!_Cvj)j7!3 zF~rpcRT117)oRGjFf&##HZV6eRj_jQaP)I`4b~0uSI}_t3s&Ir^>=X%@(cI$bMX(? zRImyNat-tJ4-M9J0UAEppV0=%82QP2n4CBkF)%PNJ8i9*%*O0j@0t$eG30{?Fbhm% zWP&ND3@Irf0s;`ZK_0B?^P-La>%lBekf!|`{}+N4bAxye0t_04rWOhTp&<|l1qAsA zC>WZUD7Xd%`3EVO8=y%|Uc;QgWNJLwkxNG0(7-|=Fw{T9Rl(4}PywP}!O{#Q$7x}v u;N$4)Fx?E~4DjKxkskd!<0z7zJ!env}MwtuVM4W0V0+oHS03ZsHsK z0GS*N(Kx&K8yf$?$<3CI+~wSJ&&fIWDfkTTd-R809u8z~a7}@O72u&Nc8)GZ2}=?X zS(6kEtHbXNDxyrLe-3;*uq=p8bdk;RQ+6Wr0xGvn%h>abrf=x$T1f_+gBy}(OVQ9n73>Iq1aCe<~W&_lKq2dudjRX`m_H$1y*+Pc$i zVvGrBx`N6kV2F><4%gzQZ~B(udXDROzUkNkFlmNm*v47kooB+yGG&DVTAdY;ZCa>I zcez&TCKM8__a43D?8f?OizEALGY~mX1gxOd>=DH}K;JqEaBZMt2fd m9FfD4{E||GsmEzH`M_a9M@ccIRse5R1w?O)xwpUMbMYTCJYvoO