Mark Sibly 9 rokov pred
rodič
commit
68e1b7818e
2 zmenil súbory, kde vykonal 21 pridanie a 19 odobranie
  1. 20 18
      src/ted2/mainwindow.monkey2
  2. 1 1
      src/ted2/ted2.monkey2

+ 20 - 18
src/ted2/mainwindow.monkey2

@@ -305,28 +305,30 @@ Class MainWindowInstance Extends Window
 	Private
 	Private
 	
 	
 	Method LoadState( jobj:JsonObject )
 	Method LoadState( jobj:JsonObject )
+	
+		_projectView.ProjectOpened-=UpdateCloseProjectMenu
 		
 		
-		If Not jobj Return
-		
-'		If jobj.Contains( "windowRect" ) Frame=ToRecti( jobj["windowRect"] )
-		If jobj.Contains( "browserSize" ) _contentView.SetViewSize( _browsersTabView,jobj["browserSize"].ToNumber() )
-		If jobj.Contains( "consoleSize" ) _contentView.SetViewSize( _consolesTabView,jobj["consoleSize"].ToNumber() )
-		
-		If jobj.Contains( "recentFiles" )
-			For Local file:=Eachin jobj["recentFiles"].ToArray()
-				Local path:=file.ToString()
-				If GetFileType( path )<>FileType.File Continue
-				_recentFiles.Push( path )
-			Next
-		End
+		If jobj
 		
 		
-		_projectView.ProjectOpened-=UpdateCloseProjectMenu
+	'		If jobj.Contains( "windowRect" ) Frame=ToRecti( jobj["windowRect"] )
+			If jobj.Contains( "browserSize" ) _contentView.SetViewSize( _browsersTabView,jobj["browserSize"].ToNumber() )
+			If jobj.Contains( "consoleSize" ) _contentView.SetViewSize( _consolesTabView,jobj["consoleSize"].ToNumber() )
+			
+			If jobj.Contains( "recentFiles" )
+				For Local file:=Eachin jobj["recentFiles"].ToArray()
+					Local path:=file.ToString()
+					If GetFileType( path )<>FileType.File Continue
+					_recentFiles.Push( path )
+				Next
+			End
+			
+			_docsManager.LoadState( jobj )
+			_buildActions.LoadState( jobj )
+			_projectView.LoadState( jobj )
 		
 		
-		_docsManager.LoadState( jobj )
-		_buildActions.LoadState( jobj )
-		_projectView.LoadState( jobj )
+		Endif
 		
 		
-		If Not _projectView.OpenProjects.Length _projectView.OpenProject( CurrentDir() )
+		If Not _projectView.OpenProjects _projectView.OpenProject( CurrentDir() )
 		
 		
 		_projectView.ProjectOpened+=UpdateCloseProjectMenu
 		_projectView.ProjectOpened+=UpdateCloseProjectMenu
 		
 		

+ 1 - 1
src/ted2/ted2.monkey2

@@ -50,7 +50,7 @@ Function Main()
 	
 	
 	Local jobj:=JsonObject.Load( "bin/ted2.state.json" )
 	Local jobj:=JsonObject.Load( "bin/ted2.state.json" )
 	
 	
-	Local rect:=New Recti( 16,16,960,800 )
+	Local rect:=New Recti( 64,64,64+960,64+800 )
 	If jobj And jobj.Contains( "windowRect" ) rect=ToRecti( jobj["windowRect"] )
 	If jobj And jobj.Contains( "windowRect" ) rect=ToRecti( jobj["windowRect"] )
 	
 	
 	New AppInstance
 	New AppInstance