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

Commit 2246802

Browse files
Merge pull request #2012 from livecode/merge-develop-9.0-12.11.2018
Merge develop 9.0 12.11.2018
2 parents a229303 + 6029fa9 commit 2246802

File tree

4 files changed

+27
-10
lines changed

4 files changed

+27
-10
lines changed

Toolset/libraries/revidelibrary.8.livecodescript

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6516,14 +6516,7 @@ on revIDETogglePaletteView
65166516
unlock screen
65176517
end revIDETogglePaletteView
65186518

6519-
on revIDEPopupContextualMenu pTargets
6520-
dispatch "revMenubarPopupContextualMenu" to stack revIDEPaletteToStackName("menubar") with pTargets
6521-
end revIDEPopupContextualMenu
6522-
6523-
local sPluginsA
6524-
on revIDEUpdatePlugins
6525-
global gREVStartupList, gREVShutdownlist, gREVDontLoadMenus
6526-
6519+
function revIDEGetAllPlugins
65276520
local tUserPlugins
65286521
put revAbsoluteFolderListing(revEnvironmentUserPluginsPath()) into tUserPlugins
65296522

@@ -6539,6 +6532,19 @@ on revIDEUpdatePlugins
65396532
if tDevelopmentPlugins is not empty then
65406533
put revCombineFilePaths(tFinal,tDevelopmentPlugins) into tFinal
65416534
end if
6535+
return tFinal
6536+
end revIDEGetAllPlugins
6537+
6538+
on revIDEPopupContextualMenu pTargets
6539+
dispatch "revMenubarPopupContextualMenu" to stack revIDEPaletteToStackName("menubar") with pTargets
6540+
end revIDEPopupContextualMenu
6541+
6542+
local sPluginsA
6543+
on revIDEUpdatePlugins
6544+
global gREVStartupList, gREVShutdownlist, gREVDontLoadMenus
6545+
6546+
local tFinal
6547+
put revIDEGetAllPlugins() into tFinal
65426548

65436549
put empty into gREVStartupList
65446550
put empty into gREVShutdownList
@@ -8520,7 +8526,9 @@ on ideStyleText pSelectedChunk, pSelectedObject, pIsField, pWhich, pValue
85208526

85218527
if pWhich is "superscript" then put -4 into tTextShiftAmount
85228528
else put 4 into tTextShiftAmount
8523-
if the textShift of tTarget is a number then put 0 into tTextShiftAmount
8529+
if the textShift of tTarget is a number AND the textShift of tTarget is not 0 then
8530+
put 0 into tTextShiftAmount
8531+
end if
85248532

85258533
set the textShift of tTarget to tTextShiftAmount
85268534
break

Toolset/palettes/start center/revStartCenterBehavior.livecodescript

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,14 @@ on ideOpenStack pTarget
9393
exit ideOpenStack
9494
end if
9595

96-
if the short name of ideStackOfObject(pTarget) is not the short name of me then
96+
local tTargetStack
97+
put the short name of ideStackOfObject(pTarget) into tTargetStack
98+
99+
local tPlugins
100+
put revIDEGetAllPlugins() into tPlugins
101+
102+
if tTargetStack is not the short name of me and \
103+
the filename of stack tTargetStack is not among the lines of tPlugins then
97104
startCenterClose
98105
end if
99106
end ideOpenStack

notes/bugfix-14079.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure subscripts and superscripts can be set more than once

notes/bugfix-17683.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure Start Center stays open when a Plugin opens on startup

0 commit comments

Comments
 (0)