Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 261bfdb

Browse files
authored
Merge pull request #1820 from livecode/merge-develop-8.2_03.11.17
Merge develop 8.2 03.11.17
2 parents 748182c + 4c5a08b commit 261bfdb

9 files changed

Lines changed: 47 additions & 42 deletions

Toolset/libraries/revidelibrary.8.livecodescript

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8642,45 +8642,49 @@ on revIDEToggle pProperty
86428642
case "Suppress Messages"
86438643
global gRevSuppressMessages
86448644
put "suppressMessages" into tToggleMessage
8645+
8646+
local tLine
86458647
if not gREVSuppressMessages then
86468648
put true into gREVSuppressMessages
86478649
# Send the suppress messages toggle message before actually suppressing messages
86488650
ideMessageSend "ideToggleChanged:" & tToggleMessage
86498651
set the lockCursor to false
8650-
repeat for each line l in the pendingMessages
8651-
if char 1 to 3 of item 2 of l is not "rev" then cancel (item 1 of l)
8652+
repeat for each line tLine in the pendingMessages
8653+
if not revIDEObjectIsOnIDEStack(item 4 to -1 of tLine) then
8654+
cancel (item 1 of tLine)
8655+
end if
86528656
end repeat
8653-
repeat for each line l in the frontScripts
8654-
if char 1 to 3 of the short name of l is not "rev" then
8655-
put l & cr after sRestoreState["front"]
8656-
remove script of l from front
8657+
repeat for each line tLine in the frontScripts
8658+
if not revIDEObjectIsOnIDEStack(tLine) then
8659+
put tLine & cr after sRestoreState["front"]
8660+
remove script of tLine from front
86578661
end if
86588662
end repeat
8659-
repeat for each line l in the backScripts
8660-
if char 1 to 3 of the short name of l is not "rev" then
8661-
put l & cr after sRestoreState["back"]
8662-
remove script of l from back
8663+
repeat for each line tLine in the backScripts
8664+
if not revIDEObjectIsOnIDEStack(tLine) then
8665+
put tLine & cr after sRestoreState["back"]
8666+
remove script of tLine from back
86638667
end if
86648668
end repeat
8665-
repeat for each line l in the stacksInUse
8666-
if char 1 to 3 of l is not "rev" then
8667-
put l & cr after sRestoreState["inUse"]
8668-
stop using stack l
8669+
repeat for each line tLine in the stacksInUse
8670+
if not revIDEObjectIsOnIDEStack(tLine) then
8671+
put tLine & cr after sRestoreState["inUse"]
8672+
stop using stack tLine
86698673
end if
86708674
end repeat
86718675
revInternal__LoadLibrary "revNoMessagesLibrary"
86728676
exit revIDEToggle
86738677
else
86748678
revInternal__UnloadLibrary "revNoMessagesLibrary"
86758679
put false into gREVSuppressMessages
8676-
repeat for each line l in sRestoreState["front"]
8677-
insert script of l into front
8680+
repeat for each line tLine in sRestoreState["front"]
8681+
insert script of tLine into front
86788682
end repeat
8679-
repeat for each line l in sRestoreState["back"]
8680-
insert script of l into back
8683+
repeat for each line tLine in sRestoreState["back"]
8684+
insert script of tLine into back
86818685
end repeat
8682-
repeat for each line l in sRestoreState["inUse"]
8683-
start using stack l
8686+
repeat for each line tLine in sRestoreState["inUse"]
8687+
start using stack tLine
86848688
end repeat
86858689
delete variable sRestoreState
86868690
end if
@@ -9613,36 +9617,36 @@ command revIDESuspendDevelopmentTools
96139617
-- Remove front and back scripts that pertain to the IDE
96149618
-- If the shift-key is down, we remove *all* 'rev' front and back scripts, including
96159619
-- the library scripts.
9616-
local tScriptsList, tRemoveFrontList, tRemoveBackList
9620+
local tScriptsList, tRemoveFrontList, tRemoveBackList, tLine
96179621
select empty
96189622
if the shiftKey is down then
96199623
put the frontScripts into tScriptsList
9620-
repeat for each line l in tScriptsList
9621-
if char 1 to 3 of the short name of l is "rev" then
9622-
put l & cr after tRemoveFrontList
9623-
remove script of l from front
9624+
repeat for each line tLine in tScriptsList
9625+
if revIDEObjectIsOnIDEStack(tLine) then
9626+
put tLine & cr after tRemoveFrontList
9627+
remove script of tLine from front
96249628
end if
96259629
end repeat
96269630
put the backScripts into tScriptsList
9627-
repeat for each line l in tScriptsList
9628-
if char 1 to 3 of the short name of l is "rev" then
9629-
put l & cr after tRemoveBackList
9630-
remove script of l from back
9631+
repeat for each line tLine in tScriptsList
9632+
if revIDEObjectIsOnIDEStack(tLine) then
9633+
put tLine & cr after tRemoveBackList
9634+
remove script of tLine from back
96319635
end if
96329636
end repeat
96339637
else
96349638
put the frontScripts into tScriptsList
9635-
repeat for each line l in tScriptsList
9636-
if the short name of l is among the items of "revFrontScriptLibrary,revDebugger,revShortCutsLibrary" then
9637-
put l & cr after tRemoveFrontList
9638-
remove script of l from front
9639+
repeat for each line tLine in tScriptsList
9640+
if the short name of tLine is among the items of "revFrontScriptLibrary,revDebuggerLibrary,revShortCutsLibrary" then
9641+
put tLine & cr after tRemoveFrontList
9642+
remove script of tLine from front
96399643
end if
96409644
end repeat
96419645
put the backScripts into tScriptsList
9642-
repeat for each line l in tScriptsList
9643-
if the short name of l is "revBackScriptLibrary,revShortCutsLibrary" then
9644-
put l & cr after tRemoveBackList
9645-
remove script of l from back
9646+
repeat for each line tLine in tScriptsList
9647+
if the short name of tLine is "revBackScriptLibrary,revShortCutsLibrary" then
9648+
put tLine & cr after tRemoveBackList
9649+
remove script of tLine from back
96469650
end if
96479651
end repeat
96489652
end if
@@ -9654,7 +9658,7 @@ command revIDESuspendDevelopmentTools
96549658
put the openStacks into tList
96559659
lock messages
96569660
repeat for each line tStack in tList
9657-
if char 1 to 3 of the short name of stack tStack is "rev" or the short name of stack tStack is among the items of "Message Box,Home,answer dialog,ask dialog" then
9661+
if revIDEStackNameIsIDEStack(tStack) then
96589662
# OK-2008-05-23 : Compare the stack's mode to its style. If they are equal then we don't need to store the mode, as opening the
96599663
# stack will result in the default mode being that which matches its style.
96609664
local tModeName

Toolset/libraries/revrulersscriptlibrary.livecodescript

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,9 @@ on resumeStack
9292
pass resumeStack
9393
else
9494
put false into lPaused
95-
if not the visible of stack "revRulersH" then
95+
if not the visible of stack "revRulersH" and "revRulersH" is among the lines of the openstacks then
9696
show stack "revRulersH"
9797
show stack "revRulersV"
98-
else
99-
palette "revRulersV"
100-
palette "revRulersH"
10198
end if
10299
revPartCalculateRulers
103100
unlock messages
15 Bytes
Binary file not shown.

Toolset/palettes/revaskdialog.rev

22 Bytes
Binary file not shown.
1.38 KB
Binary file not shown.

notes/bugfix-20431.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Show ask and answer dialogs in correct location when the screen top is not 0

notes/bugfix-20535.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Check for IDE stacks correctly when toggling `Suppress Messages`

notes/bugfix-20536.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Check for IDE stacks correctly when suspending development tools

notes/bugfix-4010.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure Image/Object Library places images/objects only on user's stack

0 commit comments

Comments
 (0)