Revision: 12990
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12990&view=rev
Author: hofman
Date: 2008-03-06 14:29:01 -0800 (Thu, 06 Mar 2008)
Log Message:
-----------
Make sure the slider window is removed as child window when ordered out delayed
at end of fading out, as otherwise the parent window may be hidden.
Modified Paths:
--------------
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVSlider.m
trunk/bibdesk_vendorsrc/amaxwell/FileView/FileView.m
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVSlider.m
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVSlider.m 2008-03-06
22:05:44 UTC (rev 12989)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVSlider.m 2008-03-06
22:29:01 UTC (rev 12990)
@@ -196,9 +196,11 @@
- (void)orderFront:(id)sender {
if ([self isVisible] == NO && [self
respondsToSelector:@selector(animator)]) {
[self setAlphaValue:0.0];
+ [super orderFront:sender];
[[self animator] setAlphaValue:1.0];
+ } else {
+ [super orderFront:sender];
}
- [super orderFront:sender];
}
- (void)orderOut:(id)sender {
@@ -210,8 +212,10 @@
}
- (void)animationDidStop:(id)animation finished:(BOOL)flag {
- if ([self alphaValue] < 0.0001 && [self isVisible])
+ if ([self alphaValue] < 0.0001 && [self isVisible]) {
+ [[self parentWindow] removeChildWindow:self];
[super orderOut:self];
+ }
}
@end
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FileView.m
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FileView.m 2008-03-06
22:05:44 UTC (rev 12989)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FileView.m 2008-03-06
22:29:01 UTC (rev 12990)
@@ -1790,7 +1790,7 @@
[self _showArrowsForIconAtIndex:anIndex];
} else if (_autoScales == NO && _sliderWindow && [event userData] ==
_sliderWindow) {
- if ([[[self window] childWindows] containsObject:_sliderWindow] ==
NO) {
+ if ([_sliderWindow parentWindow] == nil) {
NSRect sliderRect = tag == _bottomSliderTag ? [self
_bottomSliderRect] : [self _topSliderRect];
sliderRect = [self convertRect:sliderRect toView:nil];
sliderRect.origin = [[self window]
convertBaseToScreen:sliderRect.origin];
@@ -1812,7 +1812,7 @@
// we can't do this in mouseExited: since it's received as soon as the mouse
enters the slider's window (and checking the mouse location just postpones the
problems)
- (void)handleSliderMouseExited:(NSNotification *)aNote
{
- if ([[[self window] childWindows] containsObject:_sliderWindow]) {
+ if ([[_sliderWindow parentWindow] isEqual:[self window]]) {
[[self window] removeChildWindow:_sliderWindow];
[_sliderWindow orderOut:self];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
