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

Commit 0ed7253

Browse files
Merge pull request #1983 from livecode/merge-develop_9.0_05.06.18
Merge develop 9.0 05.06.18
2 parents 06edb2d + a6ad9d1 commit 0ed7253

File tree

8 files changed

+50
-25
lines changed

8 files changed

+50
-25
lines changed

Documentation/dictionary/datagrid.lcdoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2697,7 +2697,7 @@ Type: property
26972697
Associations: datagrid, datagrid general properties
26982698

26992699
Syntax: set the dgProp["edit mode action control"] of group "Data Grid" to
2700-
<control id>
2700+
the long id of <control>
27012701

27022702
Summary: Set the action control to display when the data grid is in edit mode.
27032703

@@ -2722,7 +2722,7 @@ Type: property
27222722
Associations: datagrid, datagrid general properties
27232723

27242724
Syntax: set the dgProp["edit mode action select control"] of group "Data Grid"
2725-
to <control id>
2725+
to the long id of <control>
27262726

27272727
Summary: Set the action select control to display when the data grid is in edit
27282728
mode.
@@ -2748,7 +2748,7 @@ Type: property
27482748
Associations: datagrid, datagrid general properties
27492749

27502750
Syntax: set the dgProp["edit mode reorder control"] of group "Data Grid" to
2751-
<control id>
2751+
the long id of <control>
27522752

27532753
Summary: Set the reorder control to display when the data grid is in edit mode.
27542754

@@ -2773,8 +2773,8 @@ Type: property
27732773

27742774
Associations: datagrid, datagrid general properties
27752775

2776-
Syntax: set the dgProp["left swipe control"] of group "Data Grid" to <control
2777-
id>
2776+
Syntax: set the dgProp["left swipe control"] of group "Data Grid" to the long
2777+
id of <control>
27782778

27792779
Summary: Set the control to display when a data grid row is dragged to the right.
27802780

@@ -2798,8 +2798,8 @@ Type: property
27982798

27992799
Associations: datagrid, datagrid general properties
28002800

2801-
Syntax: set the dgProp["right swipe control"] of group "Data Grid" to <control
2802-
id>
2801+
Syntax: set the dgProp["right swipe control"] of group "Data Grid" to the long
2802+
id of <control>
28032803

28042804
Summary: Set the control to display when a data grid row is dragged to the left.
28052805

Toolset/palettes/inspector/revinspectortemplate.livecodescript

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,15 @@ on lockInspector
122122
end if
123123
end lockInspector
124124

125+
local sPropertyChangedMsg
126+
125127
on idePropertyChanged
128+
cancel sPropertyChangedMsg
129+
send "__IdePropertyChanged" to me in 200 milliseconds
130+
put the result into sPropertyChangedMsg
131+
end idePropertyChanged
132+
133+
on __IdePropertyChanged
126134
lock screen
127135
# Check if the object 'types' have been changed via PI
128136
local tNewTypes
@@ -135,7 +143,7 @@ on idePropertyChanged
135143
inspectorTitleUpdate
136144
end if
137145
unlock screen
138-
end idePropertyChanged
146+
end __IdePropertyChanged
139147

140148
on inspectorTreeMenuDisplay
141149
local tObjects, tStack, tDefaultStack

Toolset/palettes/message box/behaviors/revmessageboxbehavior.livecodescript

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -667,8 +667,8 @@ private command __UpdateIntelligenceDisplay
667667
else
668668
local tControl
669669
put the name of it into tControl
670-
set the label of button "Open Stacks" of group "Stacks" of me to tIntelligence & ": " & tControl
671-
enable button "Open Stacks" of group "Stacks" of me
670+
set the label of button "Open Stacks" of group "Stacks" of card "Single Line" of me to tIntelligence & ": " & tControl
671+
enable button "Open Stacks" of group "Stacks" of card "Single Line" of me
672672
end if
673673
positionOpenStacksButton
674674
unlock messages

Toolset/palettes/message box/behaviors/revmessageboxsinglelinecardbehavior.livecodescript

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ on layoutCard
6868
set the rect of field "results" of me to tLeft,(tTop + tHeight),tRight,tBottom
6969

7070
put (tRight - tLeft) into tWidth
71-
set the width of graphic "line" to tWidth
72-
set the loc of graphic "line" to (tWidth/2),(tTop+tHeight)
71+
set the width of graphic "line" of me to tWidth
72+
set the loc of graphic "line" of me to (tWidth/2),(tTop+tHeight)
7373

7474
unlock messages
7575
send "positionOpenStacksButton" to me in 0 milliseconds

Toolset/palettes/message box/behaviors/revmessageboxsinglelinemessagebehavior.livecodescript

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,13 @@ on enterInField
2222
returnInField
2323
end enterInField
2424

25+
local sColorizeMsg
26+
2527
on textChanged
26-
dispatch "revSEColorizeField" to stack "revSEUtilities" with the long id of me
28+
cancel sColorizeMsg
29+
get the long id of me
30+
send "revSEColorizeField it" to stack "revSEUtilities" in 100 milliseconds
31+
put the result into sColorizeMsg
2732
revDisplayAutoComplete(the text of me)
2833
end textChanged
2934

@@ -78,6 +83,8 @@ command revInitialise
7883
end if
7984
end revInitialise
8085

86+
local sColorizeAutocompleteMsg
87+
8188
command revDisplayAutoComplete pString
8289
lock screen
8390
local tString
@@ -87,13 +94,20 @@ command revDisplayAutoComplete pString
8794
put tString into lMatchingHistory
8895
put the number of lines in lMatchingHistory into lNumMatching
8996
put 1 into lMatchingIndex
90-
put field "message" & char (the number of chars of field "message" +1) to (the number of chars of line 1 of lMatchingHistory) of line 1 of lMatchingHistory into field "auto complete"
97+
get field "message" & char (the number of chars of field "message" +1) to (the number of chars of line 1 of lMatchingHistory) of line 1 of lMatchingHistory
98+
if it is the text of field "auto complete" then
99+
unlock screen
100+
return empty
101+
end if
102+
put it into field "auto complete"
91103
set the hscroll of field "auto complete" to the hscroll of field "message"
92104
else
93105
put empty into field "auto complete"
94106
end if
95-
96-
dispatch "revSEColorizeField" to stack "revSEUtilities" with the long id of field "auto complete"
107+
cancel sColorizeAutocompleteMsg
108+
get the long id of field "auto complete"
109+
send "revSEColorizeField it" to stack "revSEUtilities" in 100 milliseconds
110+
put the result into sColorizeAutocompleteMsg
97111
set the textColor of char 1 to -1 of field "auto complete" to "gray70"
98112
unlock screen
99113
end revDisplayAutoComplete

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,7 +1234,7 @@ end getUpdateGutterRequestDetails
12341234
# The gutter's scroll is updated immediately. Also a message is sent to the gutter to hide its
12351235
# mutable objects (the breakpoint / compilation error images). These are show again when the update is
12361236
# actually carried out.
1237-
command updateGutterRequest pOffset, pSelectedLine, pOldLines, pNewLines, pTextChanged, pUpdateCompilationErrors, pForceBreakpointRedraw
1237+
command updateGutterRequest pOffset, pSelectedLine, pOldLines, pNewLines, pTextChanged, pUpdateCompilationErrors, pForceBreakpointRedraw, pNow
12381238
updateGutterMergeRequestDetails pOffset, pSelectedLine, pOldLines, pNewLines, pTextChanged, pUpdateCompilationErrors, pForceBreakpointRedraw
12391239
if sGutterUpdateRequest is not empty then
12401240
cancel sGutterUpdateRequest
@@ -1247,11 +1247,13 @@ command updateGutterRequest pOffset, pSelectedLine, pOldLines, pNewLines, pTextC
12471247
if exists(field "Numbers" of group "Gutter") then
12481248
set the vScroll of field "Numbers" of group "Gutter" to the vScroll of field "Script" of me
12491249
end if
1250-
# BUGFIX-20140
1251-
# 2017-JUL-28 bhall2001 Due to blocking nature of scrolling and key presses, don't send in time.
1252-
# UI effect is Gutter lags behind scrolling of Script Editor
1253-
updateGutterDo
1254-
put the result into sGutterUpdateRequest
1250+
1251+
if pNow then
1252+
updateGutterDo
1253+
else
1254+
send "updateGutterDo" to me in 200 milliseconds
1255+
put the result into sGutterUpdateRequest
1256+
end if
12551257
end updateGutterRequest
12561258

12571259
# update gutter stubs
@@ -1359,8 +1361,6 @@ end selectionChangedByArrowKey
13591361
-- PM-2016-09-22: [[ Bug 15887 ]] Distinguish between "selectionChanged" sent by the engine and \
13601362
-- "selectionChangedByArrowKey pArrowKey"
13611363
on handleSelectionChanged
1362-
saveLastSelections
1363-
13641364
caretUpdate
13651365
end handleSelectionChanged
13661366

@@ -1394,6 +1394,7 @@ on selectionUpdate
13941394
lock screen
13951395
__CheckHighlights
13961396
__ClearCurrentPlaceholder
1397+
saveLastSelections
13971398
unlock screen
13981399
end selectionUpdate
13991400

@@ -2070,7 +2071,7 @@ on scrollBarDrag
20702071
lock screen
20712072
put tVScroll into sVScroll
20722073

2073-
updateGutterRequest empty, empty, empty, empty, false, true
2074+
updateGutterRequest empty, empty, empty, empty, false, true, empty, true
20742075
unlock screen
20752076
end scrollBarDrag
20762077

notes/bugfix-20672.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix very slow arrow key nudge of multiple objects

notes/bugfix-21323.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# correction to syntax for DG2's new props

0 commit comments

Comments
 (0)