Commit 8a7b94a1 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: fixed 2 appearance bugs introduced in [23908]

parent 7f4c8080
...@@ -77,13 +77,16 @@ ...@@ -77,13 +77,16 @@
- (void)controlTintChanged - (void)controlTintChanged
{ {
BOOL b_playing = NO;
if( [o_btn_play alternateImage] == o_img_play_pressed )
b_playing = YES;
if( [NSColor currentControlTint] == NSGraphiteControlTint ) if( [NSColor currentControlTint] == NSGraphiteControlTint )
{ {
o_img_play_pressed = [NSImage imageNamed: @"play_embedded_graphite"]; o_img_play_pressed = [NSImage imageNamed: @"play_embedded_graphite"];
o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_graphite"]; o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_graphite"];
[o_btn_backward setAlternateImage: [NSImage imageNamed: @"skip_previous_embedded_graphite"]]; [o_btn_backward setAlternateImage: [NSImage imageNamed: @"skip_previous_embedded_graphite"]];
[o_btn_forward setAlternateImage: [NSImage imageNamed: @"skip_forward_embedded_graphite"]]; [o_btn_forward setAlternateImage: [NSImage imageNamed: @"skip_forward_embedded_graphite"]];
[o_btn_play setAlternateImage: o_img_play_pressed];
[o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_graphite"]]; [o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_graphite"]];
} }
else else
...@@ -92,9 +95,13 @@ ...@@ -92,9 +95,13 @@
o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_blue"]; o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_blue"];
[o_btn_backward setAlternateImage: [NSImage imageNamed: @"skip_previous_embedded_blue"]]; [o_btn_backward setAlternateImage: [NSImage imageNamed: @"skip_previous_embedded_blue"]];
[o_btn_forward setAlternateImage: [NSImage imageNamed: @"skip_forward_embedded_blue"]]; [o_btn_forward setAlternateImage: [NSImage imageNamed: @"skip_forward_embedded_blue"]];
[o_btn_play setAlternateImage: o_img_play_pressed];
[o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_blue"]]; [o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_blue"]];
} }
if( b_playing )
[o_btn_play setAlternateImage: o_img_play_pressed];
else
[o_btn_play setAlternateImage: o_img_pause_pressed];
} }
- (void)dealloc - (void)dealloc
......
...@@ -562,7 +562,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -562,7 +562,7 @@ static VLCMain *_o_sharedMainInstance = nil;
{ {
BOOL b_playing = NO; BOOL b_playing = NO;
if( [o_btn_play image] == o_img_play_pressed ) if( [o_btn_play alternateImage] == o_img_play_pressed )
b_playing = YES; b_playing = YES;
if( [NSColor currentControlTint] == NSGraphiteControlTint ) if( [NSColor currentControlTint] == NSGraphiteControlTint )
...@@ -595,9 +595,9 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -595,9 +595,9 @@ static VLCMain *_o_sharedMainInstance = nil;
} }
if( b_playing ) if( b_playing )
[o_btn_play setImage: o_img_play_pressed]; [o_btn_play setAlternateImage: o_img_play_pressed];
else else
[o_btn_play setImage: o_img_pause_pressed]; [o_btn_play setAlternateImage: o_img_pause_pressed];
} }
- (void)initStrings - (void)initStrings
......
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