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

Commit a98b6f6

Browse files
Merge pull request #1952 from livecode/merge-release-9.0.0-28.03.2018
Merge release 9.0.0 28.03.2018
2 parents f41a256 + c9c8e4e commit a98b6f6

File tree

11 files changed

+95
-46
lines changed

11 files changed

+95
-46
lines changed

Toolset/libraries/revdebuggerlibrary.livecodescript

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2071,6 +2071,9 @@ command revDebuggerUpdateScriptEditor pObject, pHandler, pLine, pState, pError
20712071
revGoScriptEditor the name of stack tScriptEditor
20722072

20732073
if pError is not empty then
2074+
if the number of items of pError is 1 then
2075+
put comma & pLine after pError
2076+
end if
20742077
# OK-2008-07-10 : This needs to be sent in time so that it arrives after the script
20752078
# editor has finished initializing itself.
20762079
send "revSEDisplayExecutionError pError, pObject" to stack tScriptEditor in 0 milliseconds

Toolset/libraries/revideextensionlibrary.livecodescript

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1066,7 +1066,8 @@ private command __revIDELCBExtensionLoad pID, pFolder, pVersion, pStatus, \
10661066
put pAdditionalInfoA["support_files"] into tSupportFiles
10671067
local tLoadOnStartup
10681068
if pError is empty then
1069-
put revIDEExtensionGetLoadOnStartup(pID) into tLoadOnStartup
1069+
put pAdditionalInfoA["_ide"] is true or \
1070+
revIDEExtensionGetLoadOnStartup(pID) into tLoadOnStartup
10701071
end if
10711072
if not pIsStartup or tLoadOnStartup is not false then
10721073
__LoadExtension tCacheIndex, "lcb", pSourceFile, pFolder, pStatus, pError

Toolset/libraries/revidelibrary.8.livecodescript

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11876,7 +11876,14 @@ function revIDELookupError pType, pError
1187611876
else if tCode is kExternalHandlerErrorCode then
1187711877
return "External handler execution error:" && item 4 to -1 of line 1 of pError
1187811878
end if
11879-
return line tCode of the scriptExecutionErrors
11879+
11880+
if tCode is an integer then
11881+
get line tCode of the scriptExecutionErrors
11882+
if it is not empty then
11883+
return it
11884+
end if
11885+
end if
11886+
return tCode
1188011887
else if pType is "warning" then
1188111888
return empty
1188211889
end if

Toolset/palettes/dictionary/behaviors/revdictionarybehavior.livecodescript

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
script "revDictionaryBehavior"
1+
script "revDictionaryBehavior" with behavior "revPaletteBehavior"
22
-- The dictionary starts to hide elements at lower than 992 pixels
33
-- *TODO* Tweak the CSS to rearrange things appropriately
44
constant kDictionaryMinWidth = 992
@@ -93,5 +93,11 @@ end showUpgradeOptions
9393

9494
# bug 17819 enable cmd+c in dictionary
9595
on commandKeyDown pWhich
96-
if pWhich is not "C" then pass commandKeyDown
96+
if pWhich is not "C" then
97+
if pWhich is "W" then
98+
close me
99+
else
100+
pass commandKeyDown
101+
end if
102+
end if
97103
end commandKeyDown

Toolset/palettes/extension manager/revideextensionmanagerrowbehavior.livecodescript

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,14 @@ private function __MenuActionsForRow pDataA
124124
put tShow after tActions
125125
end if
126126

127-
local tLoadOnStartup
128-
put "Load on startup/|Toggle Load" & return into tLoadOnStartup
129-
if revIDEExtensionGetLoadOnStartup(pDataA["name"]) is not false then
130-
put "!c" before tLoadOnStartup
127+
if not pDataA["_ide"] then
128+
local tLoadOnStartup
129+
put "Load on startup/|Toggle Load" & return into tLoadOnStartup
130+
if revIDEExtensionGetLoadOnStartup(pDataA["name"]) is not false then
131+
put "!c" before tLoadOnStartup
132+
end if
133+
put tLoadOnStartup after tActions
131134
end if
132-
put tLoadOnStartup after tActions
133135

134136
local tSampleList
135137
if pDataA["samples"] is not empty then

Toolset/palettes/revdatagridlibrary/behaviorsdatagridbuttonbehavior.livecodescript

Lines changed: 63 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3560,52 +3560,78 @@ end _table.ScrollColumnIntoView
35603560

35613561

35623562
private command _table.LayoutDataArea
3563-
local theViewRect, theRect, theRootGroup
3563+
local theViewRect, theRect
35643564
put _WorkingGroupRect(the long ID of me) into theViewRect
35653565
put theViewRect into theRect
3566-
put the long ID of group "dgHeaderComponents" of me into theRootGroup
35673566

3568-
## Shift all content
3569-
set the topLeft of theRootGroup to item 1 to 2 of theRect
3570-
3571-
## Reposition bottom element
3572-
local theSBWidth
3573-
if the visible of scrollbar "dgScrollbar" of me then put the width of scrollbar "dgScrollbar" of me into theSBWidth
3574-
else put the dgProps["scrollbar corner offset"] of me into theSBWidth
3575-
set the visible of graphic "dgCornerPiece" of group "dgHorizontalComponents" of me to the visible of scrollbar "dgScrollbar" of me
3576-
3577-
set the rect of scrollbar "dgHScrollbar" of group "dgHorizontalComponents" of me to \
3578-
item 1 of theRect, item 4 of theRect - the height of scrollbar "dgHScrollbar" of group "dgHorizontalComponents" of me, \
3579-
item 3 of theRect - theSBWidth, item 4 of theRect
3567+
local tHeaderComponents, tHorizontalComponents
3568+
local tVScrollbar, tHScrollbar, tCornerPiece
3569+
put the long id of group "dgHeaderComponents" of me into tHeaderComponents
3570+
put the long id of group "dgHorizontalComponents" of me into tHorizontalComponents
3571+
put the long id of scrollbar "dgScrollbar" of me into tVScrollbar
3572+
put the long id of scrollbar "dgHScrollbar" of tHorizontalComponents into tHScrollbar
3573+
put the long id of graphic "dgCornerPiece" of tHorizontalComponents into tCornerPiece
35803574

3581-
## Header mask
3582-
put the bottom of group "dgHeaderMask" of theRootGroup into item 4 of theRect
3583-
set the rect of group "dgHeaderMask" of theRootGroup to theRect
3575+
## Shift all content
3576+
set the topLeft of tHeaderComponents to item 1 to 2 of theRect
35843577

3585-
## Define new top/bottom
3586-
if the visible of theRootGroup then
3587-
put item 4 of theRect into item 2 of theRect
3578+
if the visible of tHeaderComponents then
3579+
# Set the rect of the header mask
3580+
local tHeaderMaskRect
3581+
put theRect into tHeaderMaskRect
3582+
put the bottom of group "dgHeaderMask" of tHeaderComponents into item 4 of tHeaderMaskRect
3583+
set the rect of group "dgHeaderMask" of tHeaderComponents to tHeaderMaskRect
3584+
## Define new top of content rect
3585+
put item 4 of tHeaderMaskRect into item 2 of theRect
35883586
end if
35893587

3590-
if the visible of group "dgHorizontalComponents" of me then
3591-
put the top of scrollbar "dgHScrollbar" of group "dgHorizontalComponents" of me into item 4 of theRect
3592-
else
3593-
put item 4 of theViewRect - the dgProps["scrollbar corner offset"] of me into item 4 of theRect
3588+
if the environment is not "mobile" then
3589+
## Reposition bottom element
3590+
local theSBWidth
3591+
if the visible of tVScrollbar then
3592+
put the width of tVScrollbar into theSBWidth
3593+
else
3594+
put the dgProps["scrollbar corner offset"] of me into theSBWidth
3595+
end if
3596+
# If the hscrollbar is not shown, then the horizontal components group
3597+
# containing it is invisible, so the corner piece is also invisible.
3598+
# So we can just set visibility of corner piece to the visible of the
3599+
# vscrollbar
3600+
set the visible of tCornerPiece to the visible of tVScrollbar
3601+
3602+
set the rect of tHScrollbar to \
3603+
item 1 of theRect, \
3604+
item 4 of theRect - the height of tHScrollbar, \
3605+
item 3 of theRect - theSBWidth, item 4 of theRect
3606+
3607+
if the visible of tHorizontalComponents then
3608+
put the top of tHScrollbar into item 4 of theRect
3609+
else
3610+
put item 4 of theViewRect - the dgProps["scrollbar corner offset"] of me \
3611+
into item 4 of theRect
3612+
end if
3613+
3614+
## V Scrollbar and corner piece
3615+
set the rect of tVScrollbar to \
3616+
item 3 of theRect - the width of tVScrollbar, \
3617+
item 2 of theRect, item 3 of theRect, \
3618+
item 4 of theRect
3619+
3620+
set the rect of tCornerPiece to \
3621+
item 3 of theRect - the width of tVScrollbar, \
3622+
the top of tHScrollbar, \
3623+
item 3 of theRect, \
3624+
the bottom of tHScrollbar
3625+
3626+
## Masks
3627+
## AL-2013-07-30 [[ Bug 10108 ]] Thumb and scrollbar appear over top of DataGrid
3628+
if the visible of tVScrollbar then
3629+
put item 3 of theRect - theSBWidth into item 3 of theRect
3630+
end if
3631+
else if __HasMobileScroller() then
3632+
mobileControlSet sScrollerId, "rect", theRect
35943633
end if
35953634

3596-
## V Scrollbar and corner piece
3597-
set the rect of scrollbar "dgScrollbar" of me to item 3 of theRect - the width of scrollbar "dgScrollbar" of me, \
3598-
item 2 of theRect, item 3 of theRect, \
3599-
item 4 of theRect
3600-
3601-
set the rect of graphic "dgCornerPiece" of group "dgHorizontalComponents" of me to \
3602-
item 3 of theRect - the width of scrollbar "dgScrollbar" of me, \
3603-
the top of scrollbar "dgHScrollbar" of group "dgHorizontalComponents" of me, item 3 of theRect, \
3604-
the bottom of scrollbar "dgHScrollbar" of group "dgHorizontalComponents" of me
3605-
3606-
## Masks
3607-
## AL-2013-07-30 [[ Bug 10108 ]] Thumb and scrollbar appear over top of DataGrid
3608-
if the visible of scrollbar "dgScrollbar" of me then put item 3 of theRect - theSBWidth into item 3 of theRect
36093635
set the topLeft of group "dgListMask" of me to item 1 to 2 of theRect
36103636
set the rect of group "dgListMask" of me to theRect
36113637
set the rect of group "dgAlternatingRowsMask" of me to theRect
-27 Bytes
Binary file not shown.

notes/bugfix-20647.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure Dictionary responds to cmd+W shortcut

notes/bugfix-21093.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix the display of errors thrown by the throw command in the script editor

notes/bugfix-21095.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure extensions required by the IDE load on startup

0 commit comments

Comments
 (0)