diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index 5b1d66124..217498a96 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -112,6 +112,7 @@ A2385DD40BFE06C800B24EF6 /* DragOverlayWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = A2385DD20BFE06C800B24EF6 /* DragOverlayWindow.m */; }; A23BBEB70A9BBE77003F7274 /* BarButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A27431D90A68538400FA780A /* BarButton.m */; }; A24103070AF80E390001C8D0 /* FilterButtonPressedLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = A253F7140A699178008EE24F /* FilterButtonPressedLeft.png */; }; + A241528B0C0261B8007DD3B4 /* Globe.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2FB06950BFF484A0095564D /* Globe.tiff */; }; A246004D0A6DCE4600D19088 /* SpeedLimitButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A246004C0A6DCE4600D19088 /* SpeedLimitButtonPressed.png */; }; A24600510A6DCE6600D19088 /* SpeedLimitButtonBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = A246004F0A6DCE6600D19088 /* SpeedLimitButtonBlue.png */; }; A24600520A6DCE6600D19088 /* SpeedLimitButtonGraphite.png in Resources */ = {isa = PBXBuildFile; fileRef = A24600500A6DCE6600D19088 /* SpeedLimitButtonGraphite.png */; }; @@ -165,7 +166,6 @@ A2F40AE40A361C00006B8288 /* Transmission.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D2784360905709500687951 /* Transmission.icns */; }; A2F6DB090A55F31C0058D1E5 /* SpeedLimitButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F6DB070A55F31C0058D1E5 /* SpeedLimitButton.png */; }; A2FB057F0BFEB6800095564D /* DragOverlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = A2FB057D0BFEB6800095564D /* DragOverlayView.m */; }; - A2FB06960BFF484A0095564D /* Globe.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2FB06950BFF484A0095564D /* Globe.tiff */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -911,7 +911,7 @@ A22A8D560AEEAFA5007E9CB9 /* Localizable.strings in Resources */, A24103070AF80E390001C8D0 /* FilterButtonPressedLeft.png in Resources */, A28FF34E0BB23A4E001F5010 /* ProgressBarLightGreen.png in Resources */, - A2FB06960BFF484A0095564D /* Globe.tiff in Resources */, + A241528B0C0261B8007DD3B4 /* Globe.tiff in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 779f5616f..df6e0ebc5 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -636,9 +636,20 @@ if (animate) { - [view setHidden: YES]; - [window setFrame: frame display: YES animate: YES]; - [view setHidden: NO]; + //the animation won't resize the view correctly, so do it here + NSRect viewFrame = [view frame]; + viewFrame.size.height += difference; + [view setFrame: viewFrame]; + [view setNeedsDisplay: YES]; + + NSViewAnimation * fadeInAnimation = [[[NSViewAnimation alloc] initWithViewAnimations: + [NSArray arrayWithObjects: [NSDictionary dictionaryWithObjectsAndKeys: view, NSViewAnimationTargetKey, + NSViewAnimationFadeInEffect, NSViewAnimationEffectKey, nil], + [NSDictionary dictionaryWithObjectsAndKeys: window, NSViewAnimationTargetKey, + [NSValue valueWithRect: frame], NSViewAnimationEndFrameKey, nil], nil]] autorelease]; + [fadeInAnimation setDuration: 0.08]; + [fadeInAnimation setAnimationBlockingMode: NSAnimationNonblocking]; + [fadeInAnimation startAnimation]; } else [window setFrame: frame display: YES];