vlc/vlc-1.1 | branch: master | Felix Paul Kühne <[email protected]> | Sun Apr 10 21:20:57 2011 +0200| [6a92d2955c1d300d85f97fe940be230d10ecc4e1] | 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/vlc-1.1.git/?a=commit;h=6a92d2955c1d300d85f97fe940be230d10ecc4e1 --- modules/gui/macosx/open.m | 9 +++++---- modules/gui/macosx/playlistinfo.m | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index 025c94f..d6dd66c 100644 --- a/modules/gui/macosx/open.m +++ b/modules/gui/macosx/open.m @@ -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..383e1e9 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
