github-starred/CocoaSplit
2
0
Fork 0
mirror of https://github.com/zakk4223/CocoaSplit.git synced 2026-05-21 06:46:14 -06:00
Code Issues 32 Projects Packages Wiki Activity Actions

Restore ability to detach input source config windows under Yosemite

Browse source
This commit is contained in:
Zakk 2014-12-03 19:37:43 -05:00
parent 2bbe224bd7
commit 1bdb24685d
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CocoaSplit.xcodeproj/project.pbxproj
View file

@ -704,11 +704,11 @@
340DC733197CF6E9003A0BB3 /* CSCaptureBase.m */,
34348C2719BDBDC000A122C2 /* PluginManagerWindowController.h */,
34348C2819BDBDC000A122C2 /* PluginManagerWindowController.m */,
347B14D9198492D900DC7DF0 /* InputPopupControllerViewController.h */,
347B14DA198492D900DC7DF0 /* InputPopupControllerViewController.m */,
345F8B331A1571B1009A81E3 /* CAMultiAudio */,
345F8B031A1060D6009A81E3 /* CSAacEncoder.h */,
345F8B041A1060D6009A81E3 /* CSAacEncoder.m */,
347B14D9198492D900DC7DF0 /* InputPopupControllerViewController.h */,
34FDD6F11A215268009A7413 /* CSPluginServices.m */,
340FE4B315F3417E00E4CE4E /* AppDelegate.h */,
340FE4B415F3417E00E4CE4E /* AppDelegate.m */,

6
CocoaSplit/Interface/InputPopupControllerViewController.xib
View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="14B25" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6250"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="InputPopupControllerViewController">
<connections>
<outlet property="InputController" destination="Gdf-y2-DdF" id="HRa-B3-t4b"/>
<outlet property="currentEffectsController" destination="0iu-Bs-KXZ" id="Lnj-mi-xjC"/>
<outlet property="multiSourceController" destination="4mF-fx-iLB" id="U30-Tg-7IY"/>
<outlet property="sourceConfigView" destination="SXE-81-50C" id="H3V-Fe-FOV"/>
@ -84,7 +84,7 @@
</connections>
</textField>
<slider verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yK1-CG-2Dt">
<rect key="frame" x="115" y="377" width="351" height="19"/>
<rect key="frame" x="115" y="373" width="351" height="20"/>
<sliderCell key="cell" controlSize="small" continuous="YES" state="on" alignment="left" maxValue="360" doubleValue="90" tickMarkPosition="below" numberOfTickMarks="5" sliderType="linear" id="RSQ-Jk-ZUV"/>
<connections>
<binding destination="Gdf-y2-DdF" name="value" keyPath="selection.rotationAngle" id="ZrZ-RS-T2W"/>

7
CocoaSplit/PreviewView.m
View file

@ -1206,8 +1206,15 @@ static CVReturn displayLinkRender(CVDisplayLinkRef displayLink, const CVTimeStam
}
- (BOOL)popoverShouldDetach:(NSPopover *)popover
{
return YES;
}
-(NSWindow *)detachableWindowForPopover:(NSPopover *)popover
{
NSLog(@"DETACHABLE WINDOW FOR POPOVER");
InputPopupControllerViewController *newViewController = [[InputPopupControllerViewController alloc] init];
InputPopupControllerViewController *oldViewController = (InputPopupControllerViewController *)popover.contentViewController;