Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Removed the fix introduced with the previous version.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sébastien MICHOY committed Jul 13, 2014
1 parent 0b902f5 commit b93b2de
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 30 deletions.
13 changes: 10 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
# MSSlidingPanelController Changelog
## [1.3.3.](https://github.com/SebastienMichoy/MSSlidingPanelController/releases/tag/1.3.3) (Sunday, July 13th, 2014)
### New
- **ADDED** a remark in documentation about the usage of MSSlidingPanelController in others containers.

### Removed
- **REMOVED** the fix appeared with release [1.3.2.](https://github.com/SebastienMichoy/MSSlidingPanelController/releases/tag/1.3.2). This one didn't work correctly in some cases. It is now advised to adjust your controller in function of your need.

## [1.3.2.](https://github.com/SebastienMichoy/MSSlidingPanelController/releases/tag/1.3.2) (Tuesday, April 22nd, 2014)
### New
- Examples are now compiled with *-Wall* *-Wextra* flags.

### Fixed
- **FIXED** a glitch when the sliding panel was inside a UITabBarController and contained a UINavigationController. Bug discovered thanks to [@nemesyssoft](https://github.com/nemesyssoft)'s question (issue [#8](https://github.com/SebastienMichoy/MSSlidingPanelController/issues/8)).
- **FIXED** a glitch when the sliding panel was inside a `UITabBarController` and contained a `UINavigationController`. Bug discovered thanks to [@nemesyssoft](https://github.com/nemesyssoft)'s question (issue [#8](https://github.com/SebastienMichoy/MSSlidingPanelController/issues/8)).

## [1.3.1.](https://github.com/SebastienMichoy/MSSlidingPanelController/releases/tag/1.3.1) (Tuesday, March 25th, 2014)
### Fixed
Expand All @@ -14,7 +21,7 @@
## [1.3.0](https://github.com/SebastienMichoy/MSSlidingPanelController/releases/tag/1.3.0) (Thursday, March 20th, 2014)
### New
- Travis-CI support is there. Thanks to Jens Kohl ([@jk](https://github.com/jk)) for his contribution.
- Adds a new method in the @protocol which allows to work with multiple gesture recognizers (issue [#1](https://github.com/SebastienMichoy/MSSlidingPanelController/issues/1)).
- **ADDED** a new method in the @protocol which allows to work with multiple gesture recognizers (issue [#1](https://github.com/SebastienMichoy/MSSlidingPanelController/issues/1)).
- Adds BSD license in every files' header.

### Comment
Expand All @@ -30,7 +37,7 @@

## [1.1.1](https://github.com/SebastienMichoy/MSSlidingPanelController/releases/tag/1.1.1) (Wednesday, January 29th, 2014)
### New
- Add a script to update the build number of the exemple.
- **ADDED** a script to update the build number of exemples.

### Fixed
- **FIXED** a false positive warning reported by clang analyzer.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.3.2</string>
<string>1.3.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.3.2</string>
<string>1.3.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
4 changes: 2 additions & 2 deletions MSSlidingPanelController.podspec
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Pod::Spec.new do |spec|
spec.name = "MSSlidingPanelController"
spec.version = "1.3.2"
spec.version = "1.3.3"

spec.platform = :ios
spec.ios.deployment_target = "7.0"
spec.requires_arc = true
spec.ios.framework = "UIKit"

spec.source = { :git => "https://github.com/SebastienMichoy/MSSlidingPanelController.git", :tag => "1.3.2" }
spec.source = { :git => "https://github.com/SebastienMichoy/MSSlidingPanelController.git", :tag => "1.3.3" }
spec.source_files = 'MSSlidingPanelController/*.{h,m}'
spec.public_header_files = 'MSSlidingPanelController/*.h'
spec.summary = "Integrate easily a sliding panel controller mechanism in your project!"
Expand Down
3 changes: 3 additions & 0 deletions MSSlidingPanelController/MSSlidingPanelController.h
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ typedef NS_ENUM(NSUInteger, MSSPSideDisplayed)
*
* The sliding panel controller allows to set two panels: one on the left, and one on the right. However, only one panel can be displayed at the same time.
* If you want to use the Storyboard, use custom segues with the following identifiers: MSSPStoryboardIDCenter, MSSPStoryboardIDLeft, MSSPStoryboardIDRight.
*
* MSSlidingPanelController shouldn't be installed as a child of another view controller. Even if you have the possibility to do it, you can encounter conflicts between containers.
*
*/
@interface MSSlidingPanelController : UIViewController

Expand Down
22 changes: 0 additions & 22 deletions MSSlidingPanelController/MSSlidingPanelController.m
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,6 @@ - (id)initWithCenterViewController:(UIViewController *)centerViewController left
*/
- (void)loadView
{
CGRect centerViewFrame;
CGSize windowSize;

[super loadView];
Expand All @@ -625,15 +624,6 @@ - (void)loadView
[[self centerView] addSubview:[[self centerViewController] view]];
[[self centerView] setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];

if ([[self parentViewController] isKindOfClass:[UITabBarController class]] &&
[[self centerViewController] isKindOfClass:[UINavigationController class]] &&
![[(UITabBarController *)[self parentViewController] tabBar] isTranslucent])
{
centerViewFrame = [[[self centerViewController] view] frame];
centerViewFrame.size.height += [[(UITabBarController *)[self parentViewController] tabBar] frame].size.height;
[[[self centerViewController] view] setFrame:centerViewFrame];
}

[self setView:[[UIView alloc] initWithFrame:CGRectMake(0, 0, windowSize.width, windowSize.height)]];
[[self view] addSubview:[self centerView]];
[[self view] addSubview:[self statusBarView]];
Expand Down Expand Up @@ -1341,9 +1331,6 @@ - (void)loadLeftPanel
*/
- (void)loadPanelForSide:(MSSPSideDisplayed)side
{
UIViewController *controller;
CGRect frame;

if (side == MSSPSideDisplayedNone)
return ;

Expand All @@ -1367,15 +1354,6 @@ - (void)loadPanelForSide:(MSSPSideDisplayed)side
[[self view] addSubview:[[self panelControllerForSide:side] view]];
[[self view] sendSubviewToBack:[[self panelControllerForSide:side] view]];

if ([[self parentViewController] isKindOfClass:[UITabBarController class]] &&
[controller isKindOfClass:[UINavigationController class]] &&
![[(UITabBarController *)[self parentViewController] tabBar] isTranslucent])
{
frame = [[controller view] frame];
frame.size.height += [[(UITabBarController *)[self parentViewController] tabBar] frame].size.height;
[[controller view] setFrame:frame];
}

[self setSideDisplayed:side];
}

Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ The `MSSlidingPanelController` is a library which allows to **easily integrate**
<img src="http://sebastienmichoy.github.io/MSSlidingPanelController/images/MSSlidingPanelController.png" />
</p>

## Requirements
- iOS 7.0+
- ARC

## Features
### MSSlidingPanelController
Either for the left and right panel, it is possible to set:
Expand Down Expand Up @@ -66,7 +70,7 @@ pod 'MSSlidingPanelController'
```

## Documentation
The documentation of `MSSlidingPanelController` can be found on [CocoaDoc](http://cocoadocs.org/docsets/MSSlidingPanelController/).
The documentation of `MSSlidingPanelController` can be found on [CocoaDocs](http://cocoadocs.org/docsets/MSSlidingPanelController/).

## Creating a MSSlidingPanelController
That's very easy to create a `MSSlidingPanelController`. Only write this few lines *et voila*!
Expand Down

0 comments on commit b93b2de

Please sign in to comment.