Commit aefb8674 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Center the FSPanel properly on the selected screen.

parent dc0416e2
......@@ -30,6 +30,7 @@
BOOL b_keptVisible;
BOOL b_alreadyCounting;
int i_timeToKeepVisibleInSec;
int i_outputScreen;
BOOL b_displayed;
BOOL b_voutWasUpdated;
......
......@@ -42,7 +42,7 @@
backing:(NSBackingStoreType)bufferingType
defer:(BOOL)flag
{
id win=[super initWithContentRect:contentRect styleMask:NSTexturedBackgroundWindowMask backing:bufferingType defer:flag];
id win = [super initWithContentRect:contentRect styleMask:NSTexturedBackgroundWindowMask backing:bufferingType defer:flag];
[win setOpaque:NO];
[win setHasShadow: NO];
[win setBackgroundColor:[NSColor clearColor]];
......@@ -51,31 +51,14 @@
[win setLevel:NSFloatingWindowLevel];
[win setAlphaValue:0.0];
/* centre the panel in the lower third of the screen */
NSPoint theCoordinate;
NSRect theScreensFrame;
NSRect theWindowsFrame;
int i_outputScreen;
i_outputScreen = var_GetInteger( VLCIntf, "video-device" );
if( i_outputScreen <=0 || i_outputScreen > (signed int)[[NSScreen screens] count] )
/* invalid preferences or none specified, using main screen */
theScreensFrame = [[NSScreen mainScreen] frame];
else
/* user-defined screen */
theScreensFrame = [[[NSScreen screens] objectAtIndex: i_outputScreen] frame];
theWindowsFrame = [win frame];
theCoordinate.x = (theScreensFrame.size.width - theWindowsFrame.size.width) / 2;
theCoordinate.y = (theScreensFrame.size.height / 3) - theWindowsFrame.size.height;
[win setFrameTopLeftPoint: theCoordinate];
[win center];
return win;
}
- (void)awakeFromNib
{
[self setContentView:[[VLCFSPanelView alloc] initWithFrame: [self frame]]];
BOOL isInside=(NSPointInRect([NSEvent mouseLocation],[self frame]));
BOOL isInside = (NSPointInRect([NSEvent mouseLocation],[self frame]));
[[self contentView] addTrackingRect:[[self contentView] bounds] owner:self userData:nil assumeInside:isInside];
if (isInside)
[self mouseEntered:NULL];
......@@ -102,6 +85,29 @@
[super dealloc];
}
-(void)center
{
/* centre the panel in the lower third of the screen */
NSPoint theCoordinate;
NSRect theScreensFrame;
NSRect theWindowsFrame;
i_outputScreen = var_GetInteger( VLCIntf->p_vlc, "video-device" );
if( i_outputScreen <= 0 || i_outputScreen > (signed int)[[NSScreen screens] count] )
/* invalid preferences or none specified, using main screen */
theScreensFrame = [[NSScreen mainScreen] frame];
else
/* user-defined screen */
theScreensFrame = [[[NSScreen screens] objectAtIndex: i_outputScreen-1] frame];
theWindowsFrame = [self frame];
theCoordinate.x = (theScreensFrame.size.width - theWindowsFrame.size.width) / 2 + theScreensFrame.origin.x;
theCoordinate.y = (theScreensFrame.size.height / 3) - theWindowsFrame.size.height + theScreensFrame.origin.y;
[self setFrameTopLeftPoint: theCoordinate];
}
- (void)setPlay
{
[[self contentView] setPlay];
......@@ -198,6 +204,9 @@
- (void)fadeIn
{
if( i_outputScreen != var_GetInteger( VLCIntf->p_vlc, "video-device" ) )
[self center];
if( [self alphaValue] < 1.0 )
{
if (![self fadeTimer])
......@@ -407,20 +416,14 @@
- (void)setPlay
{
NSImage *image;
image = [NSImage imageNamed:@"fs_play"];
[o_play setImage:image];
image = [NSImage imageNamed:@"fs_play_highlight"];
[o_play setAlternateImage:image];
[o_play setImage:[NSImage imageNamed:@"fs_play"]];
[o_play setAlternateImage: [NSImage imageNamed:@"fs_play_highlight"]];
}
- (void)setPause
{
NSImage *image;
image = [NSImage imageNamed:@"fs_pause"];
[o_play setImage:image];
image = [NSImage imageNamed:@"fs_pause_highlight"];
[o_play setAlternateImage:image];
[o_play setImage: [NSImage imageNamed:@"fs_pause"]];
[o_play setAlternateImage: [NSImage imageNamed:@"fs_pause_highlight"]];
}
- (void)setStreamTitle:(NSString *)o_title
......
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