Posn and Size are not written to the Windows Registry any more

aplteam · May 25, 2018 · 27566bb · 27566bb
1 parent 97fb194
commit 27566bb
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 22 deletions.
diff --git a/APLSource/Fire-1/GUI-7/CreateGUI-1c1.function b/APLSource/Fire-1/GUI-7/CreateGUI-1c1.function
@@ -1,7 +1,6 @@
- n←CreateGUI debugFlag;minWidth
+ n←CreateGUI debugFlag
 ⍝
  n←##.CreateGuiRefContainer
- minWidth←685
  n←CreateIcon n
  n←CreateMainForm debugFlag n
  n←CreateHiddenButtons n

diff --git a/APLSource/Fire-1/GUI-7/CreateMainForm-441.function b/APLSource/Fire-1/GUI-7/CreateMainForm-441.function
@@ -1,14 +1,12 @@
- n←CreateMainForm(debugFlag n);∆;height;size;posn
+ n←CreateMainForm(debugFlag n);∆;height
 
  height←690 330    ⍝ [0]: Initial value; [1]: Used when F8 is pressed
- size←(440,minWidth)⌈GetSizeFromWinReg ⍬
- posn←GetPosnFromWinReg
 
  ∆←⊂'Form'
  ∆,←⊂'Caption'(##.AddPidToCaption'Fire - ',##.WSID)
  ∆,←⊂'Coord' 'Pixel'
- ∆,←⊂'Size'size
- ∆,←⊂'Posn'(GetProperPosition posn size)
+ ∆,←⊂'Size'##.G.Size
+ ∆,←⊂'Posn'##.G.Posn
  ∆,←⊂'IconObj'n.TheIcon
  n.Form←⍎'TheForm'⎕WC ∆
  n.Form.CursorObj←0

diff --git a/APLSource/Fire-1/GUI-7/CreateTabs-41.function b/APLSource/Fire-1/GUI-7/CreateTabs-41.function
@@ -9,10 +9,12 @@
 
  ∆←⊂'TabButton'
  ∆,←⊂'Caption' 'Workspace'
+ ∆,←⊂'Tip' 'For scanning functions, operators, namespaces and scripts of all flavours'
  n.Tab1←⍎'Tab1'n.TabCtrl.⎕WC ∆
 
  ∆←⊂'TabButton'
  ∆,←⊂'Caption' '⎕NL'
+ ∆,←⊂'Tip' 'For scanning the names produced by ⎕NL ⍳16'
  n.Tab2←⍎'Tab2'n.TabCtrl.⎕WC ∆
 
  ∆←⊂'SubForm'

diff --git a/APLSource/Fire-1/GUI-7/GetPosnFromWinReg-4889.function b/APLSource/Fire-1/GUI-7/GetPosnFromWinReg-4889.function
diff --git a/APLSource/Fire-1/GUI-7/GetSizeFromWinReg-4889.function b/APLSource/Fire-1/GUI-7/GetSizeFromWinReg-4889.function
diff --git a/APLSource/Fire-1/GUI-7/OnClose-5.function b/APLSource/Fire-1/GUI-7/OnClose-5.function
@@ -5,6 +5,8 @@
      _←SaveValues ⍬
      _←SaveSettings ⍬
      _←CheckSALTedScripts ⍬
+     ##.G.(Posn Size)←(↑,⍵).(Posn Size)
      _←##.Cleanup
+     0::1
      1
  }
diff --git a/APLSource/Fire-1/GUI-7/SaveValues-11.function b/APLSource/Fire-1/GUI-7/SaveValues-11.function
@@ -4,9 +4,5 @@
      _←##.R.PutString(p,'ReplaceBy')##.G.ReplaceBy
      _←##.R.PutValue(p,'DetailedReport')##.G.DetailedReport
      _←##.R.PutValue(p,'SimpleReport')##.G.SimpleReport
-     posn←n.Form.Posn
-     posn[0]-←n.heightCorrection
-     _←##.R.PutString(p,'Posn')(⍕posn)
-     _←##.R.PutString(p,'Size')(⍕n.Form.Size)
      ⍬
  }
diff --git a/APLSource/Fire-1/History-1.function b/APLSource/Fire-1/History-1.function
@@ -1,5 +1,8 @@
  History
-⍝⍝ Contains information regarding the last couple of releases. A full history is avialble on GitHub. (This is line ignored)
+⍝⍝ Contains information regarding the last couple of releases. A full history is availble on GitHub. (This is line ignored)
+⍝ * 6.6.2
+⍝   * Fire now longer attempts to save and restore Posn/Size because that caused issues on multi-monitor systems.
+⍝     However, during a session Fire still remembers both, Posn and Size, and uses them to restore its GUI.
 ⍝ * 6.6.1
 ⍝   * `UCP` option removed from RegEx. You want to use this if it is available (16.0 and better).
 ⍝   * Bug fix: in case the user did perform a `⎕NL` search and ended up with some non-scripted namespaces

diff --git a/APLSource/Fire-1/Populate_G-201.function b/APLSource/Fire-1/Populate_G-201.function
@@ -15,3 +15,5 @@
  G.ChangedSaltedScript←''           ⍝ Used to remember the names of all the SALTed scripts changed by a "Replace"
  G.HaveShownNoTextWarning←0
  G.saveCurcorObj←GetCursorObj
+ G.Posn←⍬ ⍬
+ G.Size←440 685
diff --git a/APLSource/Fire-1/Version-1.function b/APLSource/Fire-1/Version-1.function
@@ -1,3 +1,3 @@
  r←Version
  ⍝ See also `History`
- r←(1↓↑¯1↑⎕NPARTS⍕⎕THIS)'6.6.1' '2018-04-28'
+ r←(1↓↑¯1↑⎕NPARTS⍕⎕THIS)'6.6.2.3' '2018-05-25'
diff --git a/Make/Make.DWS b/Make/Make.DWS
diff --git a/publish.config b/publish.config
@@ -1 +1 @@
-<tool name="Fire">  <version>6.6.1</version>  <date>2018-04-28</date>  <main>Fire</main>  <container>#._Fire</container>  <files>    <file>Fire_UC.dyalog</file>   <!-- This MUST be the first file! -->    <file>ReadMe.html</file>    <file>HowToInstall.html</file>    <file>UsefulRegExes.html</file>  </files>  <needs>    <script library="APLTree">APLTreeUtils</script>    <script library="APLTree">FilesAndDirs</script>    <script library="APLTree">OS</script>    <script library="APLTree">CompareSimple</script>    <script library="APLTree">WinReg</script>    <script library="APLTree">Tester</script>  </needs>  <scriptOnly>0</scriptOnly>  <wsid>Fire</wsid>  <autoload>1</autoload></tool>
+<tool name="Fire">  <version>6.6.2</version>  <date>2018-05-25</date>  <main>Fire</main>  <container>#._Fire</container>  <files>    <file>Fire_UC.dyalog</file>    <file>ReadMe.html</file>    <file>HowToInstall.html</file>    <file>UsefulRegExes.html</file>  </files>  <needs>    <script library="APLTree">APLTreeUtils</script>    <script library="APLTree">FilesAndDirs</script>    <script library="APLTree">OS</script>    <script library="APLTree">CompareSimple</script>    <script library="APLTree">WinReg</script>    <script library="APLTree">Tester</script>  </needs>  <scriptOnly>0</scriptOnly>  <wsid>Fire</wsid>  <autoload>1</autoload>  <buildid>3</buildid></tool>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<tool name="Fire"> <version>6.6.1</version> <date>2018-04-28</date> <main>Fire</main> <container>#._Fire</container> <files> <file>Fire_UC.dyalog</file> <!-- This MUST be the first file! --> <file>ReadMe.html</file> <file>HowToInstall.html</file> <file>UsefulRegExes.html</file> </files> <needs> <script library="APLTree">APLTreeUtils</script> <script library="APLTree">FilesAndDirs</script> <script library="APLTree">OS</script> <script library="APLTree">CompareSimple</script> <script library="APLTree">WinReg</script> <script library="APLTree">Tester</script> </needs> <scriptOnly>0</scriptOnly> <wsid>Fire</wsid> <autoload>1</autoload></tool>
		<tool name="Fire"> <version>6.6.2</version> <date>2018-05-25</date> <main>Fire</main> <container>#._Fire</container> <files> <file>Fire_UC.dyalog</file> <file>ReadMe.html</file> <file>HowToInstall.html</file> <file>UsefulRegExes.html</file> </files> <needs> <script library="APLTree">APLTreeUtils</script> <script library="APLTree">FilesAndDirs</script> <script library="APLTree">OS</script> <script library="APLTree">CompareSimple</script> <script library="APLTree">WinReg</script> <script library="APLTree">Tester</script> </needs> <scriptOnly>0</scriptOnly> <wsid>Fire</wsid> <autoload>1</autoload> <buildid>3</buildid></tool>
Expand Down