Commit 971896b9 authored by Felix Paul Kühne's avatar Felix Paul Kühne

hide the FSPanel at the same time as the cursor

Additionally, fixed a minor layout bug in the Error & Messages panel
parent a8b61130
{ <?xml version="1.0" encoding="UTF-8"?>
IBClasses = ( <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, <plist version="1.0">
{ <dict>
ACTIONS = {cleanupTable = id; showMessages = id; }; <key>IBClasses</key>
CLASS = VLCErrorInteractionPanel; <array>
LANGUAGE = ObjC; <dict>
OUTLETS = { <key>CLASS</key>
"o_cleanup_button" = id; <string>NSApplication</string>
"o_error_table" = id; <key>LANGUAGE</key>
"o_messages_btn" = id; <string>ObjC</string>
"o_window" = id; <key>SUPERCLASS</key>
}; <string>NSResponder</string>
SUPERCLASS = NSObject; </dict>
} <dict>
); <key>ACTIONS</key>
IBVersion = 1; <dict>
} <key>cleanupTable</key>
\ No newline at end of file <string>id</string>
<key>showMessages</key>
<string>id</string>
</dict>
<key>CLASS</key>
<string>VLCErrorInteractionPanel</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>o_cleanup_button</key>
<string>id</string>
<key>o_error_table</key>
<string>id</string>
<key>o_messages_btn</key>
<string>id</string>
<key>o_window</key>
<string>id</string>
</dict>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
<string>FirstResponder</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
<string>NSObject</string>
<key>LANGUAGE</key>
<string>ObjC</string>
</dict>
</array>
<key>IBVersion</key>
<string>1</string>
</dict>
</plist>
...@@ -2,15 +2,19 @@ ...@@ -2,15 +2,19 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key>
<string>46 162 356 240 0 0 1440 878 </string>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>456.0</string> <string>644</string>
<key>IBLastKnownRelativeProjectPath</key>
<string>../../vlc.xcodeproj</string>
<key>IBOldestOS</key>
<integer>5</integer>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>5</integer> <integer>6</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>9A377a</string> <string>9C31</string>
<key>targetFramework</key>
<string>IBCocoaFramework</string>
</dict> </dict>
</plist> </plist>
/***************************************************************************** /*****************************************************************************
* fspanel.m: MacOS X full screen panel * fspanel.m: MacOS X full screen panel
***************************************************************************** *****************************************************************************
* Copyright (C) 2006-2007 the VideoLAN team * Copyright (C) 2006-2008 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Jérôme Decoodt <djc at videolan dot org> * Authors: Jérôme Decoodt <djc at videolan dot org>
* Felix Kühne <fkuehne at videolan dot org> * Felix Paul Kühne <fkuehne at videolan dot org>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -31,8 +31,6 @@ ...@@ -31,8 +31,6 @@
#import "misc.h" #import "misc.h"
#import "fspanel.h" #import "fspanel.h"
#define KEEP_VISIBLE_AFTER_ACTION 4 /* time in half-sec until this panel will hide again after a user's action */
/***************************************************************************** /*****************************************************************************
* VLCFSPanel * VLCFSPanel
*****************************************************************************/ *****************************************************************************/
...@@ -284,6 +282,7 @@ ...@@ -284,6 +282,7 @@
/* get us a valid timer */ /* get us a valid timer */
if(! b_alreadyCounting ) if(! b_alreadyCounting )
{ {
i_timeToKeepVisibleInSec = config_GetInt( VLCIntf, "mouse-hide-timeout" ) / 500;
hideAgainTimer = [NSTimer scheduledTimerWithTimeInterval: 0.5 hideAgainTimer = [NSTimer scheduledTimerWithTimeInterval: 0.5
target: self target: self
selector: @selector(keepVisible:) selector: @selector(keepVisible:)
...@@ -299,10 +298,7 @@ ...@@ -299,10 +298,7 @@
{ {
/* if the user triggered an action, start over again */ /* if the user triggered an action, start over again */
if( b_keptVisible ) if( b_keptVisible )
{
i_timeToKeepVisibleInSec = KEEP_VISIBLE_AFTER_ACTION;
b_keptVisible = NO; b_keptVisible = NO;
}
/* count down until we hide ourselfes again and do so if necessary */ /* count down until we hide ourselfes again and do so if necessary */
i_timeToKeepVisibleInSec -= 1; i_timeToKeepVisibleInSec -= 1;
......
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