Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions platform/iphone/AppDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,25 @@ namespace Rtt
@interface AppViewController : CoronaViewController
{
UIResponder *fNextResponder;

// NEW: Internal flags for gesture deferral
BOOL scDeferSystemGestures; // Enable/disable flag
UIRectEdge scDeferEdges; // Which edges to defer
}

- (void)setNextResponder:(UIResponder *)responder;

- (BOOL)prefersStatusBarHidden;
- (UIStatusBarStyle)preferredStatusBarStyle;

- (void)setSystemGestureDeferralEnabled:(BOOL)enabled;
- (void)setSystemGestureDeferEdges:(UIRectEdge)edges;
- (BOOL)isSystemGestureDeferralEnabled;
- (UIRectEdge)systemGestureDeferEdges;

- (UIStatusBarStyle) preferredStatusBarStyle;
// Override this method instead of using @property
- (UIRectEdge)preferredScreenEdgesDeferringSystemGestures;

@property (nonatomic, assign) BOOL prefersHomeIndicatorAutoHidden;
@property (nonatomic, assign) UIRectEdge preferredScreenEdgesDeferringSystemGestures;
@property (nonatomic, assign) bool prefersStatusBarhidden;
@property (nonatomic, assign) UIStatusBarStyle preferredStatusBarStyle;

Expand Down
40 changes: 33 additions & 7 deletions platform/iphone/AppDelegate.mm
Original file line number Diff line number Diff line change
Expand Up @@ -222,17 +222,43 @@ @implementation AppViewController

@synthesize preferredStatusBarStyle = _preferredStatusBarStyle;
@synthesize prefersHomeIndicatorAutoHidden;
@synthesize preferredScreenEdgesDeferringSystemGestures;


- (id)initWithNibName:(NSString *)nibName bundle:(NSBundle *)nibBundle
{
self = [super initWithNibName:nibName bundle:nibBundle];
if ( self )
{
fNextResponder = nil;
}
return self;
self = [super initWithNibName:nibName bundle:nibBundle];
if ( self )
{
fNextResponder = nil;
scDeferSystemGestures = NO;
scDeferEdges = UIRectEdgeTop | UIRectEdgeBottom; // Start with top|bottom, NOT all
}
return self;
}

- (UIRectEdge)preferredScreenEdgesDeferringSystemGestures
{
return scDeferSystemGestures ? scDeferEdges : UIRectEdgeNone;
}

- (void)setSystemGestureDeferralEnabled:(BOOL)enabled
{
scDeferSystemGestures = enabled;
}

- (void)setSystemGestureDeferEdges:(UIRectEdge)edges
{
scDeferEdges = edges;
}

- (BOOL)isSystemGestureDeferralEnabled
{
return scDeferSystemGestures;
}

- (UIRectEdge)systemGestureDeferEdges
{
return scDeferEdges;
}

- (void)dealloc
Expand Down
25 changes: 13 additions & 12 deletions platform/iphone/Rtt_IPhonePlatform.mm
Original file line number Diff line number Diff line change
Expand Up @@ -1128,14 +1128,15 @@ - (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
[viewController setNeedsUpdateOfHomeIndicatorAutoHidden];
}
}
else if ([k isEqualToString:@"preferredScreenEdgesDeferringSystemGestures"])
{
viewController.preferredScreenEdgesDeferringSystemGestures = lua_toboolean( L, valueIndex )?UIRectEdgeAll:UIRectEdgeNone;
if (@available(iOS 11.0, *))
{
[viewController setNeedsUpdateOfScreenEdgesDeferringSystemGestures];
}
}
else if ([k isEqualToString:@"preferredScreenEdgesDeferringSystemGestures"])
{
[viewController setSystemGestureDeferralEnabled:lua_toboolean(L, valueIndex)];
[viewController setSystemGestureDeferEdges:(UIRectEdgeTop | UIRectEdgeBottom)];
if (@available(iOS 11.0, *))
{
[viewController setNeedsUpdateOfScreenEdgesDeferringSystemGestures];
}
}
else
{
Super::SetNativeProperty(L, key, valueIndex);
Expand All @@ -1156,10 +1157,10 @@ - (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
{
lua_pushboolean(L, viewController.prefersHomeIndicatorAutoHidden);
}
else if ([k isEqualToString:@"preferredScreenEdgesDeferringSystemGestures"])
{
lua_pushboolean(L, viewController.preferredScreenEdgesDeferringSystemGestures != UIRectEdgeNone);
}
else if ([k isEqualToString:@"preferredScreenEdgesDeferringSystemGestures"])
{
lua_pushboolean(L, [viewController isSystemGestureDeferralEnabled]);
}
else
{
result = Super::PushNativeProperty(L, key);
Expand Down