Merge pull request #2058 from livecode/merge-develop-9.0-02.05.2019

Merge develop 9.0 02.05.2019

Author: livecodepanos

Toolset/palettes/behaviors/revinspectorbehavior.livecodescript

@@ -176,8 +176,19 @@ private function inspectorCalculateLayout pGroupList, pLeft, pTop, pRowWidth, pS
    return tInspectorHeight
 end inspectorCalculateLayout
 
-local sManualHeight
+local sManualHeightOfStack, sNewHeight, sOldHeight
 on inspectorLayoutGroups pGroupList, pForceHeight
+   
+   # store height of stack when manually resizing
+   if pForceHeight is not true and the mouse is "down" and sNewHeight is not sOldHeight then
+      put the height of this stack into sManualHeightOfStack
+   end if
+   
+   # reset sManualHeightOfStack to empty if inspector was closed
+   if not the visible of me then
+      put empty into sManualHeightOfStack
+   end if
+   
    lock screen
    # Get the margin, padding
    local tMargin, tPadding
@@ -277,33 +288,66 @@ on inspectorLayoutGroups pGroupList, pForceHeight
       set the maxheight of me to tStackHeight
    end if
 
-   if pForceHeight and not sManualHeight then
-      -- Make stack smaller rather than go offscreen
-      local tScreenRect
-      put revIDEStackScreenRect(the long id of me, true) into tScreenRect
-      set the height of me to min(tStackHeight, item 4 of tScreenRect - tStackTop)
+   # reset manualHeight if user expands a non-expandable tab to full height
+   if not pForceHeight and not tCanExpand and sManualHeightOfStack is tStackHeight then
+      put empty into sManualHeightOfStack
+   end if
+   
+   -- Make stack smaller rather than go offscreen
+   local tScreenRect, tNewStackHeight
+   put revIDEStackScreenRect(the long id of me, true) into tScreenRect
+   
+   if sManualHeightOfStack is not empty then
+      put min(sManualHeightOfStack, tStackHeight) into tNewStackHeight
+      set the height of this stack to min(tNewStackHeight, item 4 of tScreenRect - tStackTop)
+   else
+      set the height of this stack to min(tStackHeight, item 4 of tScreenRect - tStackTop)
    end if
    set the left of me to tStackLeft
    set the top of me to tStackTop
 
+   local tvScrollIsOn, tvScrollChanged
+   put false into tvScrollChanged
+   
    if there is a group "inspector" of me then
-      if the height of me < tStackHeight then
-         put true into sManualHeight
+      put the vScrollbar of group "inspector" of me into tvScrollIsOn
+      if the height of me < tStackHeight - tMargin then
          set the vscrollbar of group "inspector" of me to true
+         if not tvScrollIsOn then
+            put true into tvScrollChanged
+         end if
       else
-         put false into sManualHeight
          set the vscrollbar of group "inspector" of me to false
+         if tvScrollIsOn then 
+            put true into tvScrollChanged
+         end if
       end if
+
       set the rect of group "inspector" of me to \
             item 1 of tContentRect, \ 
             item 2 of tContentRect, \ 
             the right of this card of me, \
             the bottom of this card of me - tMargin
    end if
    unlock messages
+   
+   # adapt right size of controls to vScrollbar on and off
+   if tvScrollChanged then resizeInspector
+   
    unlock screen
 end inspectorLayoutGroups
 
+before resizeStack pNewWidth, pNewHeight, pOldWidth, pOldHeight
+   put pNewHeight into sNewHeight
+   put pOldHeight into sOldHeight
+   pass resizeStack
+end resizeStack
+
+function getManualHeight
+   return sManualHeightOfStack
+end getManualHeight
+
+
 local sSelectedSection, sSelectedSectionIndex
 private on inspectorSectionSet pSection
    if sDataA is empty then

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

@@ -1,5 +1,6 @@
 script "com.livecode.pi.customprops.behavior"
 local sPropSet, sHilitePath
+constant kWidgetHeight = 150
 
 on editorInitialize
    put empty into sPropSet
@@ -113,8 +114,12 @@ on editorResize
    send "groupResize kLabelSize, kControlGap" to group "Set buttons" of me
 
    # Use all space not taken by other elements for main array display
-   local tWidgetHeight
-   put the height of me - (4 * kControlGap + kLabelFieldHeight + kKeyFieldHeight + kValueFieldHeight + kSetButtonsHeight) into tWidgetHeight
+      local tWidgetHeight, tValueHeight
+   put kWidgetHeight into tWidgetHeight
+   put max (the height of this card - ( 12 * kControlGap + kLabelFieldHeight  \
+         + kKeyFieldHeight + kValueFieldHeight + kSetButtonsHeight  \
+         + tWidgetHeight), kValueFieldHeight) into tValueHeight
+
    set the height of widget 1 of me to tWidgetHeight
    set the width of widget 1 of me to the width of me
    set the left of widget 1 of me to the left of me
@@ -136,7 +141,7 @@ on editorResize
    set the left of field "value label" of me to the left of me
 
    set the width of field "value" of me to the width of me - kLabelSize - kControlGap
-   set the height of field "value" of me to kValueFieldHeight
+   set the height of field "value" of me to kValueFieldHeight + tValueHeight
    set the top of field "value" of me to the bottom of field "key" of me + kControlGap
    set the left of field "value" of me to the right of field "value label" of me + kControlGap
 

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

@@ -41,6 +41,14 @@ on editorResize
    local tRect, tFieldRect
    put the rect of me into tRect
 
+   local tManualHeight, tManualGroupHeight
+   put getManualHeight() into tManualHeight
+   if tManualHeight is not empty then
+      put tManualHeight - the height of group "background" - kControlGap - 2 into tManualGroupHeight
+      set the height of me to tManualGroupHeight
+      set the height of the owner of me to tManualGroupHeight
+   end if
+   
    put tRect into tFieldRect
    put item 2 of tFieldRect + kButtonHeight + kColumnHeaderHeight + kControlGap into item 2 of tFieldRect
    set the effective rect of field "stackFilesField" of me to tFieldRect

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

@@ -45,15 +45,28 @@ constant kMaxHeight = 800
 on editorResize
    lock screen
    lock messages
+   local tManualHeight, tManualGroupHeight
+   put getManualHeight() into tManualHeight
+   if tManualHeight is not empty then
+      put tManualHeight - the height of group "controls" of me - kControlGap - 1 - the height of group "background" into tManualGroupHeight
+      set the height of me to tManualGroupHeight
+      set the height of the owner of me to tManualGroupHeight
+   end if
+
    set the topleft of field "rowlabel" of me to the topleft of me
    set the topright of group "controls" of me to the topright of me
    local tRect
    put the effective rect of me into tRect
    put item 2 of tRect + the height of group "controls" of me + kControlGap into item 2 of tRect
 
    local tHeight
-   put the formattedHeight of field "htmltext" of me into tHeight
-   put max(tHeight, item 4 of tRect - item 2 of tRect) into tHeight
+   if tManualHeight is not empty then
+      put tManualGroupHeight - kControlGap  into tHeight
+   else
+      put the formattedHeight of field "htmltext" of me into tHeight
+      put max(tHeight, item 4 of tRect - item 2 of tRect) into tHeight
+   end if
+   
    put min(tHeight, kMaxHeight) into tHeight
    put item 2 of tRect + tHeight into item 4 of tRect
    set the rect of field "htmltext" of me to tRect

Toolset/palettes/project browser/behaviors/revideprojectbrowsercontainerrowbehavior.livecodescript

@@ -22,7 +22,7 @@ on FillInData pDataA, pRow
    end if 
 
    -- Behaviors
-   if pDataA["behavior scriptlines"] is empty then
+   if pDataA["behavior"] is empty then
       repeat with i = 1 to 10
          hide grc ("behaviorScriptLines" & i) of me
       end repeat
@@ -31,18 +31,41 @@ on FillInData pDataA, pRow
       # check parent behaviors
       local tTargetBehavior
       local tBehaviorList
+      local tMissingBehaviorList
+      local tSkipRepeat
 
       put pDataA["behavior"] into tTargetBehavior
-      put tTargetBehavior & cr into tBehaviorList
-      repeat
-         put the behavior of tTargetBehavior into tTargetBehavior
-         if tTargetBehavior <> "" then
-            put tTargetBehavior & cr after tBehaviorList
-         else
-            exit repeat
+       
+      if tTargetBehavior <> empty then
+         if exists(tTargetBehavior) then
+            put tTargetBehavior & cr into tBehaviorList
+            put false into tSkipRepeat
+         else --##
+            put tTargetBehavior & cr into tBehaviorList
+            put tTargetBehavior & cr after tMissingBehaviorList
+            put true into tSkipRepeat
          end if
-      end repeat
-      delete char - 1 of tBehaviorList -- return
+      end if
+      
+      if not tSkipRepeat then
+         repeat
+            put the behavior of tTargetBehavior into tTargetBehavior
+            
+            if tTargetBehavior = empty then
+               exit repeat
+            end if
+           
+            if not (exists(tTargetBehavior)) then --##
+               put tTargetBehavior & cr after tBehaviorList
+               put tTargetBehavior & cr after tMissingBehaviorList
+               exit repeat
+            else
+               put tTargetBehavior & cr after tBehaviorList
+            end if
+         end repeat
+      end if
+      delete char -1 of tBehaviorList -- return
+      delete char -1 of tMissingBehaviorList -- return
 
       local tNoOfLInes
       local tCounter
@@ -51,6 +74,9 @@ on FillInData pDataA, pRow
       put min(the number of lines of tBehaviorList, 10) into tNoOfLines
       repeat with i = 1 to tNoOfLines
          set the toolTip of grc ("behaviorScriptLines" & i) of me to line i of tBehaviorList
+         if line i of tBehaviorList is among the lines of tMissingBehaviorList then
+            set the toolTip of grc ("behaviorScriptLines" & i) of me to ("Missing: " & line i of tBehaviorList)
+         end if
          show grc ("behaviorScriptLines" & i) of me
          put ("cBehaviorLongID" & i) into tCPName
          set the tCPName of me to line i of tBehaviorList
@@ -234,6 +260,7 @@ end dvRowControl
 
 setProp dvHilite[pHiliteColor] pBoolean
    # Override basic hilite feature...
+   local tCPName
 
    if pBoolean then
       set the foregroundColor of field "type" of me to revIDEColor("dataView_TextHiliteColor")
@@ -242,7 +269,12 @@ setProp dvHilite[pHiliteColor] pBoolean
       set the backgroundColor of field "scriptLines" of me to  revIDEColor("dataView_TextHiliteColor")
       repeat with i = 1 to 10
          set the foregroundColor of grc ("behaviorScriptLines" & i) of me to revIDEColor("text_1")
-         set the backgroundColor of grc ("behaviorScriptLines" & i) of me to revIDEColor("dataView_TextHiliteColor")
+         put ("cBehaviorLongID" & i) into tCPName
+         if exists(the tCPName of me) then
+            set the backgroundColor of grc ("behaviorScriptLines" & i) of me to revIDEColor("dataView_TextHiliteColor")
+         else
+            set the backgroundColor of grc ("behaviorScriptLines" & i) of me to revIDEColor("dataView_scriptErrorBackgroundColor")
+         end if
       end repeat
       set the colorOverlay["color"] of button "typeIcon" of me to revIDEColor("dataView_TextHiliteColor")
       set the foregroundColor of me to revIDEColor("dataView_disclosureIconHiliteColor")
@@ -262,11 +294,12 @@ setProp dvHilite[pHiliteColor] pBoolean
          set the backgroundColor of field "scriptLines" of me to revIDEColor("dataView_hiliteColor")
       end if
 
-      local tCPName
       repeat with i = 1 to 10
          put ("cBehaviorLongID" & i) into tCPName
          if exists(the tCPName of me) and the scriptStatus of the tCPName of me is "error" then
             set the backgroundColor of grc ("behaviorScriptLines" & i) of me to revIDEColor("dataView_scriptErrorBackgroundColor")
+         else if not (exists(the tCPName of me)) then
+            set the backgroundColor of grc ("behaviorScriptLines" & i) of me to revIDEColor("dataView_scriptErrorBackgroundColor")
          else
             set the backgroundColor of grc ("behaviorScriptLines" & i) of me to revIDEColor("dataView_hiliteColor")
          end if
@@ -284,33 +317,43 @@ on mouseUp
          edit the script of the cObjectLongID of me
          break
       case "behaviorScriptLines1"
+         checkExistence (the cBehaviorLongID1 of me), 1
          edit the script of the cBehaviorLongID1 of me
          break
       case "behaviorScriptLines2"
+         checkExistence (the cBehaviorLongID2 of me), 2
          edit the script of the cBehaviorLongID2 of me
          break
       case "behaviorScriptLines3"
+         checkExistence (the cBehaviorLongID3 of me), 3
          edit the script of the cBehaviorLongID3 of me
          break
       case "behaviorScriptLines4"
+         checkExistence (the cBehaviorLongID4 of me), 4
          edit the script of the cBehaviorLongID4 of me
          break
       case "behaviorScriptLines5"
+         checkExistence (the cBehaviorLongID5 of me), 5
          edit the script of the cBehaviorLongID5 of me
          break
       case "behaviorScriptLines6"
+         checkExistence (the cBehaviorLongID6 of me), 6
          edit the script of the cBehaviorLongID6 of me
          break
       case "behaviorScriptLines7"
+         checkExistence (the cBehaviorLongID7 of me), 7
          edit the script of the cBehaviorLongID7 of me
          break
       case "behaviorScriptLines8"
+         checkExistence (the cBehaviorLongID8 of me), 8
          edit the script of the cBehaviorLongID8 of me
          break
       case "behaviorScriptLines9"
+         checkExistence (the cBehaviorLongID9 of me), 9
          edit the script of the cBehaviorLongID9 of me
          break
       case "behaviorScriptLines10"
+         checkExistence (the cBehaviorLongID10 of me), 10
          edit the script of the cBehaviorLongID10 of me
          break
       case "icon"
@@ -332,6 +375,17 @@ on mouseDoubleUp
    goToObject the cObjectLongID of me
 end mouseDoubleUp
 
+command checkExistence pLongID, pOrdinal
+   local tGraphic
+   if exists(pLongID) then 
+      return empty
+   else
+      put ("behaviorScriptLines" & pOrdinal) into tGraphic
+      answer the toolTip of grc tGraphic of me
+      exit to top
+   end if
+end checkExistence
+
 on CloseFieldEditor pFieldEditor, pRow, pKey, pClosingTriggeredBy
    # The text the user entered is different than the current value of the target field.
    if word 1 of the cObjectLongID of me is "stack" and \