Skip to content

Commit

Permalink
hold toplevel window ref to impl switching to and from first window o…
Browse files Browse the repository at this point in the history 
…n animation end
  • Loading branch information
Moses DeJong committed May 25, 2011
1 parent c151108 commit 0454be5
Show file tree
Hide file tree
Showing 5 changed files with 120 additions and 95 deletions.
75 changes: 40 additions & 35 deletions AVSync.xcodeproj/mo.mode1v3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>CD37492C138D831700C54D0B</string>
<string>CD39E4AB138D8CF900E492BC</string>
<key>history</key>
<array>
<string>CD143D811382364F00963BBE</string>
Expand All @@ -347,7 +347,8 @@
<string>CDCC53BD1386077A002E51AB</string>
<string>CDCC53CB13860852002E51AB</string>
<string>CD8D4471138D79A00084B9BC</string>
<string>CD8D447D138D79C20084B9BC</string>
<string>CD39E48C138D8C6400E492BC</string>
<string>CD39E45D138D8B8200E492BC</string>
</array>
</dict>
<key>SplitCount</key>
Expand All @@ -359,14 +360,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 0}, {995, 576}}</string>
<string>{{0, 0}, {995, 571}}</string>
<key>RubberWindowFrame</key>
<string>22 55 1356 823 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
<string>576pt</string>
<string>571pt</string>
</dict>
<dict>
<key>ContentConfiguration</key>
Expand All @@ -379,14 +380,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 581}, {995, 201}}</string>
<string>{{0, 576}, {995, 206}}</string>
<key>RubberWindowFrame</key>
<string>22 55 1356 823 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
<string>201pt</string>
<string>206pt</string>
</dict>
</array>
<key>Proportion</key>
Expand All @@ -405,9 +406,9 @@
</array>
<key>TableOfContents</key>
<array>
<string>CD37492D138D831700C54D0B</string>
<string>CD39E48E138D8C6400E492BC</string>
<string>1CE0B1FE06471DED0097A5F4</string>
<string>CD37492E138D831700C54D0B</string>
<string>CD39E48F138D8C6400E492BC</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
Expand Down Expand Up @@ -545,12 +546,12 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
<string>CD374930138D831700C54D0B</string>
<string>CD374931138D831700C54D0B</string>
<string>1C78EAAD065D492600B07095</string>
<string>CD143B9E1382345C00963BBE</string>
<string>1C530D57069F1CE1000CFCEE</string>
<string>CD39E496138D8C6400E492BC</string>
<string>CD39E497138D8C6400E492BC</string>
<string>1CD10A99069EF8BA00B06720</string>
<string>CD8D4474138D79A00084B9BC</string>
<string>CD143B9E1382345C00963BBE</string>
<string>1C78EAAD065D492600B07095</string>
<string>/Users/mo/Development/QTAnimationiPhone/AVSync/AVSync.xcodeproj</string>
</array>
<key>WindowString</key>
Expand Down Expand Up @@ -592,6 +593,8 @@
<string>437pt</string>
</dict>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
Expand Down Expand Up @@ -631,7 +634,7 @@
<key>TableOfContents</key>
<array>
<string>CD143B9E1382345C00963BBE</string>
<string>CD37490D138D7EFB00C54D0B</string>
<string>CD39E440138D8AFF00E492BC</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
Expand Down Expand Up @@ -753,13 +756,13 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
<string>CD37490E138D7EFB00C54D0B</string>
<string>CD39E441138D8AFF00E492BC</string>
<string>1C162984064C10D400B95A72</string>
<string>CD37490F138D7EFB00C54D0B</string>
<string>CD374910138D7EFB00C54D0B</string>
<string>CD374911138D7EFB00C54D0B</string>
<string>CD374912138D7EFB00C54D0B</string>
<string>CD374913138D7EFB00C54D0B</string>
<string>CD39E442138D8AFF00E492BC</string>
<string>CD39E443138D8AFF00E492BC</string>
<string>CD39E444138D8AFF00E492BC</string>
<string>CD39E445138D8AFF00E492BC</string>
<string>CD39E446138D8AFF00E492BC</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
Expand All @@ -786,34 +789,34 @@
<key>Dock</key>
<array>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CDD528C0622207200134675</string>
<key>PBXProjectModuleLabel</key>
<string></string>
<string>AVSyncViewController.m</string>
<key>StatusBarVisibility</key>
<true/>
</dict>
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 0}, {781, 212}}</string>
<string>{{0, 0}, {1057, 477}}</string>
<key>RubberWindowFrame</key>
<string>106 381 781 470 0 0 1440 878 </string>
<string>106 116 1057 735 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
<string>781pt</string>
<string>1057pt</string>
</dict>
</array>
<key>Proportion</key>
<string>212pt</string>
<string>477pt</string>
</dict>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
Expand All @@ -824,9 +827,9 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 217}, {781, 212}}</string>
<string>{{0, 482}, {1057, 212}}</string>
<key>RubberWindowFrame</key>
<string>106 381 781 470 0 0 1440 878 </string>
<string>106 116 1057 735 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXProjectFindModule</string>
Expand All @@ -835,7 +838,7 @@
</dict>
</array>
<key>Proportion</key>
<string>429pt</string>
<string>694pt</string>
</dict>
</array>
<key>Name</key>
Expand All @@ -849,13 +852,13 @@
<key>TableOfContents</key>
<array>
<string>1C530D57069F1CE1000CFCEE</string>
<string>CD143BA61382345C00963BBE</string>
<string>CD143BA71382345C00963BBE</string>
<string>CD39E45F138D8B8200E492BC</string>
<string>CD39E460138D8B8200E492BC</string>
<string>1CDD528C0622207200134675</string>
<string>1CD0528E0623707200166675</string>
</array>
<key>WindowString</key>
<string>106 381 781 470 0 0 1440 878 </string>
<string>106 116 1057 735 0 0 1440 878 </string>
<key>WindowToolGUID</key>
<string>1C530D57069F1CE1000CFCEE</string>
<key>WindowToolIsVisible</key>
Expand All @@ -878,6 +881,8 @@
<key>Dock</key>
<array>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
Expand Down Expand Up @@ -913,7 +918,7 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
<string>CD37492F138D831700C54D0B</string>
<string>CD39E447138D8AFF00E492BC</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
Expand All @@ -923,7 +928,7 @@
<key>WindowToolGUID</key>
<string>1C78EAAD065D492600B07095</string>
<key>WindowToolIsVisible</key>
<false/>
<true/>
</dict>
<dict>
<key>Identifier</key>
Expand Down
69 changes: 42 additions & 27 deletions AVSync.xcodeproj/mo.pbxuser
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
};
28D7ACF60DDB3853001CB0EB /* AVSyncViewController.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {934, 576}}";
sepNavSelRange = "{860, 0}";
sepNavVisRange = "{44, 975}";
sepNavIntBoundsRect = "{{0, 0}, {1282, 726}}";
sepNavSelRange = "{535, 46}";
sepNavVisRange = "{0, 1008}";
};
};
28D7ACF70DDB3853001CB0EB /* AVSyncViewController.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {934, 2256}}";
sepNavSelRange = "{1554, 1}";
sepNavVisRange = "{1267, 1403}";
sepNavIntBoundsRect = "{{0, 0}, {996, 2144}}";
sepNavSelRange = "{3940, 24}";
sepNavVisRange = "{2019, 1399}";
sepNavWindowFrame = "{{15, 0}, {1341, 877}}";
};
};
Expand Down Expand Up @@ -117,8 +117,8 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
PBXPerProjectTemplateStateSaveDate = 328040184;
PBXWorkspaceStateSaveDate = 328040184;
PBXPerProjectTemplateStateSaveDate = 328042973;
PBXWorkspaceStateSaveDate = 328042973;
};
perUserProjectItems = {
CD143D811382364F00963BBE /* PlistBookmark */ = CD143D811382364F00963BBE /* PlistBookmark */;
Expand All @@ -133,9 +133,10 @@
CD143EB51382D95600963BBE /* PBXTextBookmark */ = CD143EB51382D95600963BBE /* PBXTextBookmark */;
CD32FC561385EED100362BF9 /* PBXTextBookmark */ = CD32FC561385EED100362BF9 /* PBXTextBookmark */;
CD32FCB91385F30500362BF9 /* PBXTextBookmark */ = CD32FCB91385F30500362BF9 /* PBXTextBookmark */;
CD37492C138D831700C54D0B /* PBXTextBookmark */ = CD37492C138D831700C54D0B /* PBXTextBookmark */;
CD39E45D138D8B8200E492BC /* PBXTextBookmark */ = CD39E45D138D8B8200E492BC /* PBXTextBookmark */;
CD39E48C138D8C6400E492BC /* PBXTextBookmark */ = CD39E48C138D8C6400E492BC /* PBXTextBookmark */;
CD39E4AB138D8CF900E492BC /* PBXTextBookmark */ = CD39E4AB138D8CF900E492BC /* PBXTextBookmark */;
CD8D4471138D79A00084B9BC /* PBXTextBookmark */ = CD8D4471138D79A00084B9BC /* PBXTextBookmark */;
CD8D447D138D79C20084B9BC /* PBXTextBookmark */ = CD8D447D138D79C20084B9BC /* PBXTextBookmark */;
CDCC53BD1386077A002E51AB /* PBXTextBookmark */ = CDCC53BD1386077A002E51AB /* PBXTextBookmark */;
CDCC53CB13860852002E51AB /* PBXTextBookmark */ = CDCC53CB13860852002E51AB /* PBXTextBookmark */;
};
Expand Down Expand Up @@ -197,6 +198,13 @@
sepNavWindowFrame = "{{15, 0}, {1341, 877}}";
};
};
CD143BC1138235F100963BBE /* AVAnimatorMedia.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {934, 22976}}";
sepNavSelRange = "{26476, 0}";
sepNavVisRange = "{26191, 959}";
};
};
CD143BC5138235F100963BBE /* AVAnimatorView.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {934, 4112}}";
Expand Down Expand Up @@ -398,15 +406,32 @@
vrLen = 1097;
vrLoc = 713;
};
CD37492C138D831700C54D0B /* PBXTextBookmark */ = {
CD39E45D138D8B8200E492BC /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* AVSyncViewController.m */;
name = "AVSyncViewController.m: 65";
rLen = 1;
rLoc = 1554;
rLen = 24;
rLoc = 3940;
rType = 0;
vrLen = 1403;
vrLoc = 1267;
};
CD39E48C138D8C6400E492BC /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = CD143BC1138235F100963BBE /* AVAnimatorMedia.m */;
name = "AVAnimatorMedia.m: 820";
rLen = 0;
rLoc = 26476;
rType = 0;
vrLen = 959;
vrLoc = 26191;
};
CD39E4AB138D8CF900E492BC /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* AVSyncViewController.m */;
name = "AVSyncViewController.m: 132";
rLen = 0;
rLoc = 4624;
rType = 0;
vrLen = 632;
vrLoc = 4389;
};
CD8D4471138D79A00084B9BC /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
Expand All @@ -418,22 +443,12 @@
vrLen = 729;
vrLoc = 27882;
};
CD8D447D138D79C20084B9BC /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* AVSyncViewController.m */;
name = "AVSyncViewController.m: 66";
rLen = 0;
rLoc = 1375;
rType = 0;
vrLen = 1491;
vrLoc = 1373;
};
CDCC53BD1386077A002E51AB /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF60DDB3853001CB0EB /* AVSyncViewController.h */;
name = "AVSyncViewController.h: 28";
rLen = 0;
rLoc = 860;
rLoc = 849;
rType = 0;
vrLen = 975;
vrLoc = 44;
Expand Down
15 changes: 0 additions & 15 deletions AVSyncViewController.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,14 +172,6 @@
</object>
<int key="connectionID">13</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">container</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="758387006"/>
</object>
<int key="connectionID">16</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
Expand Down Expand Up @@ -339,13 +331,11 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>container</string>
<string>fastButton</string>
<string>slowButton</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UIView</string>
<string>UIButton</string>
<string>UIButton</string>
</object>
Expand All @@ -354,16 +344,11 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>container</string>
<string>fastButton</string>
<string>slowButton</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">container</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">fastButton</string>
<string key="candidateClassName">UIButton</string>
Expand Down
Loading

0 comments on commit 0454be5

Please sign in to comment.