File tree Expand file tree Collapse file tree 3 files changed +228
-67
lines changed Expand file tree Collapse file tree 3 files changed +228
-67
lines changed Original file line number Diff line number Diff line change 15
15
// Controls the view displaying a stash diff
16
16
@interface PBStashContentController : PBViewController {
17
17
IBOutlet id webView;
18
- IBOutlet PBWebStashController *webController;
18
+ IBOutlet PBWebStashController *unstagedController;
19
+ IBOutlet PBWebStashController *stagedController;
19
20
}
20
21
21
22
- (void ) showStash : (PBGitStash*)stash ;
Original file line number Diff line number Diff line change 11
11
#import " PBGitDefaults.h"
12
12
#import " PBGitStash.h"
13
13
14
+ const CGFloat kMinPaneSize = 32.0 ;
15
+
14
16
@implementation PBStashContentController
15
17
16
18
- (void ) awakeFromNib
17
19
{
18
- [webController setRepository: repository];
20
+ [unstagedController setRepository: repository];
21
+ [stagedController setRepository: repository];
19
22
}
20
23
21
24
- (void ) showStash : (PBGitStash*)stash
@@ -24,7 +27,17 @@ - (void) showStash:(PBGitStash*)stash
24
27
NSString *stashSha = [repository shaForRef: [PBGitRef refFromString: stashRef]];
25
28
PBGitCommit *commit = [PBGitCommit commitWithRepository: repository andSha: stashSha];
26
29
27
- [webController changeContentTo: commit];
30
+ [unstagedController changeContentTo: commit];
31
+ }
32
+
33
+ - (CGFloat)splitView : (NSSplitView *)splitView constrainMinCoordinate : (CGFloat)proposedMin ofSubviewAt : (NSInteger )dividerIndex
34
+ {
35
+ return kMinPaneSize ;
36
+ }
37
+
38
+ - (CGFloat)splitView : (NSSplitView *)splitView constrainMaxCoordinate : (CGFloat)proposedMax ofSubviewAt : (NSInteger )dividerIndex
39
+ {
40
+ return [splitView frame ].size .height - kMinPaneSize ;
28
41
}
29
42
30
43
@end
You can’t perform that action at this time.
0 commit comments