mirror of
				https://github.com/libsdl-org/SDL.git
				synced 2025-11-04 09:44:35 +00:00 
			
		
		
		
	Android: Use SCREEN_ORIENTATION_FULL_USER instead of SCREEN_ORIENTATION_FULL_SENSOR for resizable window.
The former will respect user orientation lock setting while the latter does not.
This commit is contained in:
		
				
					committed by
					
						
						Sam Lantinga
					
				
			
			
				
	
			
			
			
						parent
						
							b6e6c73541
						
					
				
				
					commit
					3373667faa
				
			@@ -1128,8 +1128,8 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
 | 
				
			|||||||
        /* No valid hint, nothing is explicitly allowed */
 | 
					        /* No valid hint, nothing is explicitly allowed */
 | 
				
			||||||
        if (!is_portrait_allowed && !is_landscape_allowed) {
 | 
					        if (!is_portrait_allowed && !is_landscape_allowed) {
 | 
				
			||||||
            if (resizable) {
 | 
					            if (resizable) {
 | 
				
			||||||
                /* All orientations are allowed */
 | 
					                /* All orientations are allowed, respecting user orientation lock setting */
 | 
				
			||||||
                req = ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR;
 | 
					                req = ActivityInfo.SCREEN_ORIENTATION_FULL_USER;
 | 
				
			||||||
            } else {
 | 
					            } else {
 | 
				
			||||||
                /* Fixed window and nothing specified. Get orientation from w/h of created window */
 | 
					                /* Fixed window and nothing specified. Get orientation from w/h of created window */
 | 
				
			||||||
                req = (w > h ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
 | 
					                req = (w > h ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
 | 
				
			||||||
@@ -1138,8 +1138,8 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
 | 
				
			|||||||
            /* At least one orientation is allowed */
 | 
					            /* At least one orientation is allowed */
 | 
				
			||||||
            if (resizable) {
 | 
					            if (resizable) {
 | 
				
			||||||
                if (is_portrait_allowed && is_landscape_allowed) {
 | 
					                if (is_portrait_allowed && is_landscape_allowed) {
 | 
				
			||||||
                    /* hint allows both landscape and portrait, promote to full sensor */
 | 
					                    /* hint allows both landscape and portrait, promote to full user */
 | 
				
			||||||
                    req = ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR;
 | 
					                    req = ActivityInfo.SCREEN_ORIENTATION_FULL_USER;
 | 
				
			||||||
                } else {
 | 
					                } else {
 | 
				
			||||||
                    /* Use the only one allowed "orientation" */
 | 
					                    /* Use the only one allowed "orientation" */
 | 
				
			||||||
                    req = (is_landscape_allowed ? orientation_landscape : orientation_portrait);
 | 
					                    req = (is_landscape_allowed ? orientation_landscape : orientation_portrait);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user