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

Commit 06ccf86

Browse files
livecodealilivecodeali
committed
Merge remote-tracking branch 'origin/develop-8.1' into merge-develop-8.1_23.05.17
Conflicts: Toolset/palettes/revpreferencesgui.rev Toolset/palettes/revresourcecenter.rev Toolset/palettes/script editor/revscripteditor.8.rev
2 parents dd32d7e + 94b48d0 commit 06ccf86

File tree

8 files changed

+40
-6
lines changed

8 files changed

+40
-6
lines changed

‎Toolset/libraries/revcommonlibrary.livecodescript‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -965,6 +965,13 @@ on revDeleteFolder pSrcFolder
965965
return the result
966966
end revDeleteFolder
967967

968+
on revDeleteFile pWhich
969+
close file pWhich
970+
if the platform is "MacOS" then put empty into URL ("resfile:"&pWhich)
971+
put empty into URL ("binfile:"&pWhich)
972+
delete file pWHich
973+
end revDeleteFile
974+
968975
on revMoveFolder pSrcFolder, pDestFolder
969976
if the platform is "Win32" then
970977
revSetWindowsShellCommand

‎Toolset/libraries/revidelibrary.8.livecodescript‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11285,8 +11285,12 @@ command ideExecuteScript pScript, pObject, pDebugMode, @rValidScript
1128511285

1128611286
if pObject is empty then
1128711287
put the long id of this card of the defaultStack into pObject
11288-
else if word 1 of pObject is "stack" then
11289-
set the defaultStack to the short name of pObject
11288+
else
11289+
set the defaultStack to the short name of ideStackOfObject(pObject)
11290+
end if
11291+
11292+
-- Need to target 'this card' if a stack is selected
11293+
if word 1 of pObject is "stack" then
1129011294
put the long id of this card of pObject into pObject
1129111295
end if
1129211296

‎Toolset/palettes/revicons.rev‎

0 Bytes
Binary file not shown.

‎Toolset/palettes/revonline.rev‎

-349 Bytes
Binary file not shown.

‎Toolset/palettes/revupdatechecker.rev‎

-911 KB
Binary file not shown.

‎Toolset/palettes/tutorial/revtutorial.livecodescript‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,9 +1129,9 @@ command revTutorialSetWindowShape pContentWidth, pContentHeight, pPointVertical,
11291129
create graphic "Shape" in tGroup
11301130
put it into tGraphic
11311131
set the style of it to "rectangle"
1132-
set the width of it to pContentWidth * the screenpixelscale
1133-
set the height of it to pContentHeight * the screenpixelscale
1134-
1132+
set the width of it to pContentWidth
1133+
set the height of it to pContentHeight
1134+
11351135
create graphic "Pointer" in tGroup
11361136
put it into tPointer
11371137
set the style of tPointer to "regular"

‎notes/bugfix-19585.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Improve rendering of Interactive Tutorial on Windows when screenPixelScale > 1

‎tests/messagebox/execution.livecodescript‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ on TestIntelligenceObjectPropertyCompleted
262262

263263
local tValidScript
264264
ideExecuteScript "width", tButton, false, tValidScript
265-
TestAssert "intelligence object property autocomplete result", the result is empty
265+
TestAssert "intelligence object property autocomplete result", msg is the width of tButton
266266
TestAssert "intelligence object property autocomplete executed", tValidScript is "put the width of" && tButtonName
267267
end TestIntelligenceObjectPropertyCompleted
268268

@@ -304,3 +304,25 @@ on TestIntelligenceObjectCommandWithTwoParams
304304
TestAssert "intelligence object command two params result", msg is 2
305305
TestAssert "intelligence object command two params executed", tValidScript is tToExecute
306306
end TestIntelligenceObjectCommandWithTwoParams
307+
308+
on TestReferenceControlOnActiveStack
309+
local tStack, tField
310+
create stack
311+
put it into tStack
312+
313+
set the defaultStack to the short name of tStack
314+
315+
create field
316+
put it into tField
317+
318+
-- change the default stack
319+
create stack
320+
set the defaultStack to the short name of it
321+
322+
local tToExecute
323+
put "put bar into field 1" into tToExecute
324+
ideExecuteScript tToExecute, tStack, false, tValidScript
325+
326+
TestAssert "intelligence object command two params result", the text of tField is "bar"
327+
TestAssert "intelligence object command two params executed", tValidScript is tToExecute
328+
end TestReferenceControlOnActiveStack

0 commit comments

Comments
 (0)