Browse Source

working...

Mark Sibly 9 years ago
parent
commit
3087f312ba
1 changed files with 24 additions and 58 deletions
  1. 24 58
      modules/mojo/app/app.monkey2

+ 24 - 58
modules/mojo/app/app.monkey2

@@ -862,11 +862,21 @@ Class AppInstance
 			
 			
 				SendWindowEvent( EventType.WindowClose )
 				SendWindowEvent( EventType.WindowClose )
 			
 			
-			Case SDL_WINDOWEVENT_MOVED
+			Case SDL_WINDOWEVENT_MAXIMIZED
+				
+				SendWindowEvent( EventType.WindowMaximized )
+				
+			Case SDL_WINDOWEVENT_MINIMIZED
 			
 			
-			Case SDL_WINDOWEVENT_RESIZED
+				SendWindowEvent( EventType.WindowMinimized )
+				
+			Case SDL_WINDOWEVENT_RESTORED
+			
+				SendWindowEvent( EventType.WindowRestored )
+				
+			Case SDL_WINDOWEVENT_EXPOSED
 			
 			
-			Case SDL_WINDOWEVENT_SIZE_CHANGED
+				RequestRender()
 			
 			
 			Case SDL_WINDOWEVENT_FOCUS_GAINED
 			Case SDL_WINDOWEVENT_FOCUS_GAINED
 			
 			
@@ -885,7 +895,6 @@ Class AppInstance
 				Print "SDL_WINDOWEVENT_FOCUS_LOST"
 				Print "SDL_WINDOWEVENT_FOCUS_LOST"
 			
 			
 				Local active:=_active
 				Local active:=_active
-'				_activeWindow=Null		'Not a great idea!
 				_active=False
 				_active=False
 			
 			
 				If _mouseView And Not _captureMouse	'should probably do this anyway?
 				If _mouseView And Not _captureMouse	'should probably do this anyway?
@@ -924,6 +933,16 @@ Class AppInstance
 			
 			
 			event->Dispatch()
 			event->Dispatch()
 
 
+		Case SDL_DROPFILE
+		
+			Local devent:=Cast<SDL_DropEvent Ptr>( event )
+			
+			Local path:=String.FromCString( devent->file ).Replace( "\","/" )
+			
+			SDL_free( devent->file )
+			
+			FileDropped( path )
+
 		Case SDL_RENDER_TARGETS_RESET
 		Case SDL_RENDER_TARGETS_RESET
 		
 		
 			Print "SDL_RENDER_TARGETS_RESET"
 			Print "SDL_RENDER_TARGETS_RESET"
@@ -936,42 +955,6 @@ Class AppInstance
 		
 		
 			mojo.graphics.glutil.glGraphicsSeq+=1
 			mojo.graphics.glutil.glGraphicsSeq+=1
 
 
-		Case SDL_WINDOWEVENT_MOVED
-			
-			SendWindowEvent( EventType.WindowMoved )
-					
-		Case SDL_WINDOWEVENT_RESIZED
-		
-			SendWindowEvent( EventType.WindowResized )
-				
-			UpdateWindows()
-			
-		Case SDL_WINDOWEVENT_MAXIMIZED
-			
-			SendWindowEvent( EventType.WindowMaximized )
-			
-		Case SDL_WINDOWEVENT_MINIMIZED
-		
-			SendWindowEvent( EventType.WindowMinimized )
-			
-		Case SDL_WINDOWEVENT_RESTORED
-		
-			SendWindowEvent( EventType.WindowRestored )
-			
-		Case SDL_WINDOWEVENT_EXPOSED
-		
-			RequestRender()
-
-		Case SDL_DROPFILE
-		
-			Local devent:=Cast<SDL_DropEvent Ptr>( event )
-			
-			Local path:=String.FromCString( devent->file ).Replace( "\","/" )
-			
-			SDL_free( devent->file )
-			
-			FileDropped( path )
-
 		End
 		End
 			
 			
 	End
 	End
@@ -1010,24 +993,7 @@ Class AppInstance
 				UpdateWindows()
 				UpdateWindows()
 			
 			
 				Return 0
 				Return 0
-				
-			Case SDL_WINDOWEVENT_MAXIMIZED
-				
-				SendWindowEvent( EventType.WindowMaximized )
-				
-				Return 0
-				
-			Case SDL_WINDOWEVENT_MINIMIZED
-			
-				SendWindowEvent( EventType.WindowMinimized )
-				
-				Return 0
-				
-			Case SDL_WINDOWEVENT_RESTORED
-			
-				SendWindowEvent( EventType.WindowRestored )
-				
-				Return 0
+
 			End
 			End
 
 
 #if __TARGET__="ios"
 #if __TARGET__="ios"