Commit efc88959 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: fixed too early reset when scrolling the credits

parent 25974670
...@@ -68,8 +68,8 @@ static VLAboutBox *_o_sharedInstance = nil; ...@@ -68,8 +68,8 @@ static VLAboutBox *_o_sharedInstance = nil;
} }
/***************************************************************************** /*****************************************************************************
* VLC About Window * VLC About Window
*****************************************************************************/ *****************************************************************************/
- (void)showAbout - (void)showAbout
{ {
...@@ -93,13 +93,13 @@ static VLAboutBox *_o_sharedInstance = nil; ...@@ -93,13 +93,13 @@ static VLAboutBox *_o_sharedInstance = nil;
/* setup the creator / revision field */ /* setup the creator / revision field */
NSString *compiler; NSString *compiler;
#ifdef __clang__ #ifdef __clang__
compiler = [NSString stringWithFormat:@"clang %s", __clang_version__]; compiler = [NSString stringWithFormat:@"clang %s", __clang_version__];
#elif __llvm__ #elif __llvm__
compiler = [NSString stringWithFormat:@"llvm-gcc %s", __VERSION__]; compiler = [NSString stringWithFormat:@"llvm-gcc %s", __VERSION__];
#else #else
compiler = [NSString stringWithFormat:@"gcc %s", __VERSION__]; compiler = [NSString stringWithFormat:@"gcc %s", __VERSION__];
#endif #endif
[o_revision_field setStringValue: [o_revision_field setStringValue:
[NSString stringWithFormat: _NS("Compiled by %s with %@"), VLC_CompileBy(), compiler]]; [NSString stringWithFormat: _NS("Compiled by %s with %@"), VLC_CompileBy(), compiler]];
...@@ -166,8 +166,14 @@ static VLAboutBox *_o_sharedInstance = nil; ...@@ -166,8 +166,14 @@ static VLAboutBox *_o_sharedInstance = nil;
/* If at end, restart at the top */ /* If at end, restart at the top */
if( f_current >= f_end ) if( f_current >= f_end )
{ {
[o_credits_textview scrollPoint:NSMakePoint( 0, 0 )]; /* f_end may be wrong on first run, so don't trust it too much */
if( f_end == [o_credits_textview bounds].size.height - [o_credits_scrollview bounds].size.height )
{
b_restart = YES; b_restart = YES;
[o_credits_textview scrollPoint:NSMakePoint( 0, 0 )];
}
else
f_end = [o_credits_textview bounds].size.height - [o_credits_scrollview bounds].size.height;
} }
} }
} }
...@@ -179,8 +185,8 @@ static VLAboutBox *_o_sharedInstance = nil; ...@@ -179,8 +185,8 @@ static VLAboutBox *_o_sharedInstance = nil;
} }
/***************************************************************************** /*****************************************************************************
* VLC GPL Window, action called from the about window and the help menu * VLC GPL Window, action called from the about window and the help menu
*****************************************************************************/ *****************************************************************************/
- (IBAction)showGPL:(id)sender - (IBAction)showGPL:(id)sender
{ {
...@@ -192,8 +198,8 @@ static VLAboutBox *_o_sharedInstance = nil; ...@@ -192,8 +198,8 @@ static VLAboutBox *_o_sharedInstance = nil;
} }
/***************************************************************************** /*****************************************************************************
* VLC Generic Help Window * VLC Generic Help Window
*****************************************************************************/ *****************************************************************************/
- (void)showHelp - (void)showHelp
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment