vlc | branch: master | Felix Paul Kühne <[email protected]> | Sun Apr 10 21:25:28 2011 +0200| [a96776fc14bce968f44eaf82b447272ff4d44d51] | committer: Felix Paul Kühne
macosx: cosmetics decode URL for the Info panel, fixed potential redraw issue in the open panel > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a96776fc14bce968f44eaf82b447272ff4d44d51 --- modules/gui/macosx/fspanel.m | 2 +- modules/gui/macosx/open.m | 11 ++++++----- modules/gui/macosx/playlistinfo.m | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/gui/macosx/fspanel.m b/modules/gui/macosx/fspanel.m index c2c5a2f..89f2b40 100644 --- a/modules/gui/macosx/fspanel.m +++ b/modules/gui/macosx/fspanel.m @@ -467,7 +467,7 @@ s_rc.origin.x = 481; s_rc.origin.y = 64; s_rc.size.width = 55; - addTextfield( VLCTimefield, o_streamPosition_txt, NSRightTextAlignment, systemFontOfSize, whiteColor, 0 ); + addTextfield( VLCTimeField, o_streamPosition_txt, NSRightTextAlignment, systemFontOfSize, whiteColor, 0 ); return view; } diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index 7cf84dd..9c944b9 100644 --- a/modules/gui/macosx/open.m +++ b/modules/gui/macosx/open.m @@ -1,7 +1,7 @@ /***************************************************************************** * open.m: Open dialogues for VLC's MacOS X port ***************************************************************************** - * Copyright (C) 2002-2009 the VideoLAN team + * Copyright (C) 2002-2011 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen <[email protected]> @@ -479,23 +479,24 @@ static VLCOpen *_o_sharedMainInstance = nil; o_win_rect.origin.y = ( o_win_rect.origin.y + o_view_rect.size.height ) - o_view_rect.size.height; /* remove the MRL view */ - [o_mrl_view removeFromSuperviewWithoutNeedingDisplay]; + [o_mrl_view removeFromSuperview]; } else { /* we need to expand */ [o_mrl_view setFrame: NSMakeRect( 0, [o_mrl_btn frame].origin.y, o_view_rect.size.width, o_view_rect.size.height )]; - [o_mrl_view setNeedsDisplay: YES]; + [o_mrl_view setNeedsDisplay: NO]; [o_mrl_view setAutoresizesSubviews: YES]; - /* add the MRL view */ - [[o_panel contentView] addSubview: o_mrl_view]; + /* enlarge panel size for MRL view */ o_win_rect.size.height = o_win_rect.size.height + o_view_rect.size.height; } [o_panel setFrame: o_win_rect display:YES animate: YES]; [o_panel displayIfNeeded]; + if( [o_mrl_btn state] == NSOnState ) + [[o_panel contentView] addSubview: o_mrl_view]; } - (IBAction)inputSlaveAction:(id)sender diff --git a/modules/gui/macosx/playlistinfo.m b/modules/gui/macosx/playlistinfo.m index e7cb6d8..bf5eadf 100644 --- a/modules/gui/macosx/playlistinfo.m +++ b/modules/gui/macosx/playlistinfo.m @@ -256,8 +256,8 @@ static VLCInfo *_o_sharedInstance = nil; } /* fill uri info */ - char * psz_url = input_item_GetURI( p_item ); - [o_uri_txt setStringValue: [NSString stringWithUTF8String: psz_url ? psz_url : "" ]]; + char * psz_url = decode_URI( input_item_GetURI( p_item ) ); + [o_uri_txt setStringValue: [NSString stringWithUTF8String: psz_url ? psz_url : ""]]; free( psz_url ); /* fill title info */ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
