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

Commit 3cdedb1

Browse files
committed
Merge remote-tracking branch 'origin/develop-9.0' into merge-develop-9.0-13.05.2019
2 parents f19fdec + fa4de52 commit 3cdedb1

19 files changed

+62
-19
lines changed

Documentation/guides/Extending LiveCode.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ method to allocate an instance, and then call `initWithVoice:` on it:
10711071
The `+` indicates this is a class method, i.e. we don't require an
10721072
instance of the class to call the method.
10731073

1074-
foreign handler Objc_NSSpeechSynthesizerInitWithVoice(in pSynthesizer as ObjcId, in pVoice as optional ObjcId) returns ObjcId \
1074+
foreign handler Objc_NSSpeechSynthesizerInitWithVoice(in pSynthesizer as ObjcRetainedId, in pVoice as optional ObjcId) returns optional ObjcRetainedId \
10751075
binds to "objc:NSSpeechSynthesizer.-initWithVoice:"
10761076
10771077
The `-` here indicates this is an instance method, i.e. we require an

Toolset/libraries/revfrontscriptlibrary.livecodescript

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,14 @@ on closeStack
393393
put revTargetStack() into tStackName
394394

395395
local tFileName
396+
397+
local tIsBuildingStandalone
398+
put (there is a stack "revStandaloneProgress" and \
399+
the mode of stack "revStandaloneProgress" > 0) into tIsBuildingStandalone
400+
396401
# OK-2008-08-05 : Bug 6562 - Bug where the user was being prompted to delete the home stack on startup,
397402
# caused by revIDEStack returning true/false instead of empty/non-empty.
398-
if tAllClosed and not revIDEStackNameIsIDEStack(tStackName) then
403+
if not tIsBuildingStandalone and tAllClosed and not revIDEStackNameIsIDEStack(tStackName) then
399404
put the effective fileName of gREVTargetStack into tFileName
400405

401406
# TH - 7689 improved wording of warning message

Toolset/palettes/behaviors/revinspectorbehavior.livecodescript

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ constant kMaxLabelSize = 200
44
# The inspector data
55
local sDataA
66

7+
# used by manualHeight
8+
local sStackIsInFront
9+
710
on setAsBehavior pTarget
811
dispatch "setAsBehavior" to revIDEFrameBehavior() with the long id of this me
912
set the behavior of pTarget to the long id of this me
@@ -36,6 +39,7 @@ before openStack
3639
end repeat
3740
set the stackfiles of me to tStackFiles
3841
revIDEPopDefaultFolder
42+
put true into sStackIsInFront
3943
end openStack
4044

4145
on resizeInspector
@@ -180,7 +184,8 @@ local sManualHeightOfStack, sNewHeight, sOldHeight
180184
on inspectorLayoutGroups pGroupList, pForceHeight
181185

182186
# store height of stack when manually resizing
183-
if pForceHeight is not true and the mouse is "down" and sNewHeight is not sOldHeight then
187+
if pForceHeight is not true and the mouse is "down" \
188+
and sNewHeight is not sOldHeight and the mouseStack is empty and sStackIsInFront then
184189
put the height of this stack into sManualHeightOfStack
185190
end if
186191

@@ -277,7 +282,11 @@ on inspectorLayoutGroups pGroupList, pForceHeight
277282

278283
local tStackHeight
279284
if tInspectorHeight is empty then
280-
put kInspectorMinHeight into tStackHeight
285+
if sManualHeightOfStack is not empty then
286+
put sManualHeightOfStack into tStackHeight
287+
else
288+
put kInspectorMinHeight into tStackHeight
289+
end if
281290
else
282291
put tInspectorHeight + tMargin into tStackHeight
283292
end if
@@ -288,11 +297,6 @@ on inspectorLayoutGroups pGroupList, pForceHeight
288297
set the maxheight of me to tStackHeight
289298
end if
290299

291-
# reset manualHeight if user expands a non-expandable tab to full height
292-
if not pForceHeight and not tCanExpand and sManualHeightOfStack is tStackHeight then
293-
put empty into sManualHeightOfStack
294-
end if
295-
296300
-- Make stack smaller rather than go offscreen
297301
local tScreenRect, tNewStackHeight
298302
put revIDEStackScreenRect(the long id of me, true) into tScreenRect
@@ -343,6 +347,16 @@ before resizeStack pNewWidth, pNewHeight, pOldWidth, pOldHeight
343347
pass resizeStack
344348
end resizeStack
345349

350+
on resumeStack
351+
put true into sStackIsInFront
352+
pass resumeStack
353+
end resumeStack
354+
355+
on suspendStack
356+
put false into sStackIsInFront
357+
pass suspendStack
358+
end suspendStack
359+
346360
function getManualHeight
347361
return sManualHeightOfStack
348362
end getManualHeight

Toolset/palettes/inspector/editors/com.livecode.pi.customprops.behavior.livecodescript

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
script "com.livecode.pi.customprops.behavior"
22
local sPropSet, sHilitePath
3-
constant kWidgetHeight = 150
43

54
on editorInitialize
65
put empty into sPropSet
@@ -92,9 +91,10 @@ end editorUpdate
9291
constant kControlGap = 5
9392
constant kKeyFieldHeight = 21
9493
constant kLabelFieldHeight = 21
95-
constant kValueFieldHeight = 63
94+
constant kValueFieldHeight = 126
9695
constant kLabelSize = 50
9796
constant kSetButtonsHeight = 30
97+
constant kWidgetHeight = 150
9898

9999
on editorResize
100100
lock screen
@@ -113,12 +113,15 @@ on editorResize
113113
set the lockLoc of group "Set buttons" of me to true
114114
send "groupResize kLabelSize, kControlGap" to group "Set buttons" of me
115115

116+
local tTopGroupHeight
117+
put the bottom of group "background" into tTopGroupHeight
118+
116119
# Use all space not taken by other elements for main array display
117-
local tWidgetHeight, tValueHeight
120+
local tWidgetHeight, tValueHeight
118121
put kWidgetHeight into tWidgetHeight
119-
put max (the height of this card - ( 12 * kControlGap + kLabelFieldHeight \
122+
put max(the height of this card - ( 6 * kControlGap + kLabelFieldHeight \
120123
+ kKeyFieldHeight + kValueFieldHeight + kSetButtonsHeight \
121-
+ tWidgetHeight), kValueFieldHeight) into tValueHeight
124+
+ tWidgetHeight + tTopGroupHeight), 0) into tValueHeight
122125

123126
set the height of widget 1 of me to tWidgetHeight
124127
set the width of widget 1 of me to the width of me

Toolset/palettes/script editor/behaviors/revsefindmaincardbehavior.livecodescript

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ end menuPick
3333

3434
on closeCard
3535
historySave
36-
send "revSEFindFinalize" to (getCaller())
36+
local tCaller
37+
put getCaller() into tCaller
38+
if there is a stack tCaller then
39+
send "revSEFindFinalize" to tCaller
40+
end if
3741
pass closeCard
3842
end closeCard
3943

@@ -133,7 +137,11 @@ command updateButtonStates
133137
end updateButtonStates
134138

135139
private function getCaller
136-
return the long id of the cCaller of the owner of me
140+
if there is a stack (the cCaller of the owner of me) then
141+
return the long id of the cCaller of the owner of me
142+
else
143+
return empty
144+
end if
137145
end getCaller
138146

139147
# Returns

Toolset/palettes/start center/revStartCenterBehavior.livecodescript

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ end socialMediaUnhiliteAll
170170

171171
command recentFilesInitialise
172172
set the dgProps["hilite color"] of group "recentFiles" to uiColor("edition")
173-
set the linkColor to uiColor("edition")
174-
set the underlineLinks to false
173+
set the linkColor of this stack to uiColor("edition")
174+
set the underlineLinks of this stack to false
175175
end recentFilesInitialise
176176

177177
command recentFilesSet

Toolset/palettes/tools/revtools.livecodescript

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ on generatePalette
170170
repeat while there is a group "contents"
171171
delete group "contents"
172172
end repeat
173+
reset the templateGroup
173174
create group "contents"
174175

175176
# Clear the error group

Toolset/resources/supporting_files/property_definitions/com.livecode.interface.classic.CurveGraphic.tsv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ type graphic tool
33
title Curve Graphic
44

55
----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- -----
6-
name Curve
6+
name Curve
7+
label
78
tooltip
89
style curve rectangle,roundrect,line,oval,regular,line,curve,polygon
910
opaque false

Toolset/resources/supporting_files/property_definitions/com.livecode.interface.classic.LineGraphic.tsv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ type graphic tool
33

44
----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- -----
55
name Line
6+
label
67
tooltip
78
style line rectangle,roundrect,line,oval,regular,line,curve,polygon
89
opaque false

Toolset/resources/supporting_files/property_definitions/com.livecode.interface.classic.OvalGraphic.tsv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ title Oval Graphic
44

55
----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- -----
66
name Oval
7+
label
78
tooltip
89
style oval rectangle,roundrect,line,oval,regular,line,curve,polygon
910
opaque true

0 commit comments

Comments
 (0)