diff --git a/Ed/EdAction.icl b/Ed/EdAction.icl index b16a62d4845e53e1e853c247712db7a954c6d825..de4997f9d1bf6c1d67b540b8171f976528d392ab 100644 --- a/Ed/EdAction.icl +++ b/Ed/EdAction.icl @@ -38,7 +38,8 @@ applyAction selectionRemoved action = THEN ( positionAfterMove move selection.start >>>= \newPos -> vChangeSelectionTo {start=newPos,end=newPos} >>> - mChangeSelectionTo {start=newPos,end=newPos} >>> +// DvA: can skip this as we know we are going from no selection to no selection... +// mChangeSelectionTo {start=newPos,end=newPos} >>> IF (move == PageUp || move == PageDown) THEN (vMoveCursor move) @@ -56,7 +57,9 @@ applyAction selectionRemoved action = ) ) >>>= \newPos -> vChangeSelectionTo {start=newPos,end=newPos} >>> - mChangeSelectionTo {start=newPos,end=newPos} >>> +// DvA: we know we are going from selection to no selection so... +// mChangeSelectionTo {start=newPos,end=newPos} >>> + mRemoveSelection >>> vScrollToCursor ) diff --git a/Ed/EdVisualText.icl b/Ed/EdVisualText.icl index 35f92119b4fd1e552106018f4e35249ec86093ad..53de9ec37361bc3434375d9d58d5e327b97d8eee 100644 --- a/Ed/EdVisualText.icl +++ b/Ed/EdVisualText.icl @@ -94,7 +94,7 @@ where | isNothing maybeOldViewDomain = abort "vResetViewDomain (EdVisualText.icl): unknown window id" #! oldViewDomain = fromJust maybeOldViewDomain - #! (oldViewFrame,pState) = accPIO (getWindowViewFrame windowId) pState +// #! (oldViewFrame,pState) = accPIO (getWindowViewFrame windowId) pState #! (viewDomain,(editState,pState)) = computeViewDomain (editState,pState) | viewDomain == oldViewDomain #! pState = appPIO (updateWindow windowId Nothing) pState @@ -117,7 +117,7 @@ where | isNothing maybeOldViewDomain = abort "vResetViewDomain (EdVisualText.icl): unknown window id" #! oldViewDomain = fromJust maybeOldViewDomain - #! (oldViewFrame,pState) = accPIO (getWindowViewFrame windowId) pState +// #! (oldViewFrame,pState) = accPIO (getWindowViewFrame windowId) pState #! (viewDomain,(editState,pState)) = computeViewDomain (editState,pState) | viewDomain == oldViewDomain #! pState = appPIO (updateWindow windowId Nothing) pState diff --git a/Ide/EdCommon.icl b/Ide/EdCommon.icl index bd451a8d0fc2663940db9316b47376fac6c9ebbc..b559691125a18faead78b4a9e8133da0b7fb730b 100644 --- a/Ide/EdCommon.icl +++ b/Ide/EdCommon.icl @@ -45,30 +45,12 @@ where mRemoveSelection :: EditMonad (PSt General) nothing mRemoveSelection = - getMenuSelection >>>= \mselold -> accEnv (getMenuIds) >>>= \mIds -> - let - mselnew = Nothing - fragaction - | changed mselold mselnew = (handlefrag mselnew mIds >>> setMenuSelection mselnew) - = skip - in - fragaction -where - changed Nothing Nothing = False - changed (Just strl) (Just strr) = strl <> strr - changed _ _ = True - - handlefrag (Just str) mIds - = appEnv (appPIO (setMenuElementTitles - [(mIds.mn_odm,"Open "+++(MakeDefPathname str)) - ,(mIds.mn_oim,"Open "+++(MakeImpPathname str)) - ])) - handlefrag _ mIds = - appEnv (appPIO (setMenuElementTitles - [(mIds.mn_odm,"Open Definition...") - ,(mIds.mn_oim,"Open Implementation...") - ])) + appEnv (appPIO (setMenuElementTitles + [(mIds.mn_odm,"Open Definition...") + ,(mIds.mn_oim,"Open Implementation...") + ])) >>> + setMenuSelection Nothing // control click