Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
6ee4bbdd
Commit
6ee4bbdd
authored
Oct 12, 2006
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* fade in quicker and fix the fade-in/out problems reported by Benjamin. Thanks for the feedback
parent
75df49da
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
21 deletions
+12
-21
modules/gui/macosx/fspanel.m
modules/gui/macosx/fspanel.m
+12
-21
No files found.
modules/gui/macosx/fspanel.m
View file @
6ee4bbdd
...
@@ -112,7 +112,7 @@
...
@@ -112,7 +112,7 @@
[[
self
contentView
]
setVolumeLevel
:
f_volumeLevel
];
[[
self
contentView
]
setVolumeLevel
:
f_volumeLevel
];
}
}
/* This routine is called repeatedly
when the mouse enters the window from outside it.
*/
/* This routine is called repeatedly
to fade in the window
*/
-
(
void
)
focus
:(
NSTimer
*
)
timer
-
(
void
)
focus
:(
NSTimer
*
)
timer
{
{
if
(
[
self
alphaValue
]
<
1
.
0
)
if
(
[
self
alphaValue
]
<
1
.
0
)
...
@@ -129,9 +129,18 @@
...
@@ -129,9 +129,18 @@
}
}
}
}
/* This routine is called repeatedly
when the mouse exits the window from inside it
*/
/* This routine is called repeatedly
to hide the window
*/
-
(
void
)
unfocus
:(
NSTimer
*
)
timer
-
(
void
)
unfocus
:(
NSTimer
*
)
timer
{
{
if
(
b_keptVisible
)
{
b_keptVisible
=
NO
;
b_fadeQueued
=
NO
;
[[
self
fadeTimer
]
release
];
[
self
setFadeTimer
:
NULL
];
[
self
fadeIn
];
return
;
}
if
(
[
self
alphaValue
]
>
0
.
0
)
if
(
[
self
alphaValue
]
>
0
.
0
)
[
self
setAlphaValue
:[
self
alphaValue
]
-
0
.
1
];
[
self
setAlphaValue
:[
self
alphaValue
]
-
0
.
1
];
if
(
[
self
alphaValue
]
<=
0
.
1
)
if
(
[
self
alphaValue
]
<=
0
.
1
)
...
@@ -151,29 +160,11 @@
...
@@ -151,29 +160,11 @@
}
}
}
}
/* If the mouse enters a window, go make sure we fade in */
-
(
void
)
mouseEntered
:(
NSEvent
*
)
theEvent
{
[
self
fadeIn
];
}
/* If the mouse exits a window, go make sure we fade out */
-
(
void
)
mouseExited
:(
NSEvent
*
)
theEvent
-
(
void
)
mouseExited
:(
NSEvent
*
)
theEvent
{
{
/* the user left the window, fade out immediatelly and prevent any timer action */
if
(
b_alreadyCounting
)
{
[
hideAgainTimer
invalidate
];
[
hideAgainTimer
release
];
b_alreadyCounting
=
NO
;
hideAgainTimer
=
NULL
;
}
/* give up our focus, so the vout may show us again without letting the user clicking it */
/* give up our focus, so the vout may show us again without letting the user clicking it */
if
(
[[[[
VLCMain
sharedInstance
]
getControls
]
getVoutView
]
isFullscreen
]
)
if
(
[[[[
VLCMain
sharedInstance
]
getControls
]
getVoutView
]
isFullscreen
]
)
[[[[[
VLCMain
sharedInstance
]
getControls
]
getVoutView
]
window
]
makeKeyWindow
];
[[[[[
VLCMain
sharedInstance
]
getControls
]
getVoutView
]
window
]
makeKeyWindow
];
[
self
fadeOut
];
}
}
-
(
void
)
fadeIn
-
(
void
)
fadeIn
...
@@ -181,7 +172,7 @@
...
@@ -181,7 +172,7 @@
if
(
[
self
alphaValue
]
<
1
.
0
)
if
(
[
self
alphaValue
]
<
1
.
0
)
{
{
if
(
!
[
self
fadeTimer
])
if
(
!
[
self
fadeTimer
])
[
self
setFadeTimer
:[
NSTimer
scheduledTimerWithTimeInterval
:
0
.
1
target
:
self
selector
:
@selector
(
focus
:
)
userInfo
:
[
NSNumber
numberWithShort
:
1
]
repeats
:
YES
]];
[
self
setFadeTimer
:[
NSTimer
scheduledTimerWithTimeInterval
:
0
.
05
target
:
self
selector
:
@selector
(
focus
:
)
userInfo
:
[
NSNumber
numberWithShort
:
1
]
repeats
:
YES
]];
else
if
([[[
self
fadeTimer
]
userInfo
]
shortValue
]
==
0
)
else
if
([[[
self
fadeTimer
]
userInfo
]
shortValue
]
==
0
)
b_fadeQueued
=
YES
;
b_fadeQueued
=
YES
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment