Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
ebab71b5
Commit
ebab71b5
authored
Dec 30, 2011
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fix another rendering issue with the 'time slider's fancy gradient effect'
parent
0af51801
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
11 deletions
+9
-11
extras/package/macosx/Resources/English.lproj/MainMenu.xib
extras/package/macosx/Resources/English.lproj/MainMenu.xib
+2
-2
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+7
-9
No files found.
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @
ebab71b5
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
<integer
value=
"4895"
/>
<integer
value=
"4895"
/>
<integer
value=
"1617"
/>
<integer
value=
"1617"
/>
<integer
value=
"4596"
/>
<integer
value=
"4596"
/>
<integer
value=
"
4756
"
/>
<integer
value=
"
2
"
/>
<integer
value=
"2730"
/>
<integer
value=
"2730"
/>
<integer
value=
"4722"
/>
<integer
value=
"4722"
/>
<integer
value=
"915"
/>
<integer
value=
"915"
/>
...
@@ -608,7 +608,7 @@
...
@@ -608,7 +608,7 @@
</object>
</object>
<object
class=
"NSCustomView"
id=
"515305233"
>
<object
class=
"NSCustomView"
id=
"515305233"
>
<reference
key=
"NSNextResponder"
ref=
"429932428"
/>
<reference
key=
"NSNextResponder"
ref=
"429932428"
/>
<int
key=
"NSvFlags"
>
-21474
83374
</int>
<int
key=
"NSvFlags"
>
-21474
79278
</int>
<string
key=
"NSFrame"
>
{{401, 110}, {163, 96}}
</string>
<string
key=
"NSFrame"
>
{{401, 110}, {163, 96}}
</string>
<reference
key=
"NSSuperview"
ref=
"429932428"
/>
<reference
key=
"NSSuperview"
ref=
"429932428"
/>
<object
class=
"CIAdditionCompositing"
key=
"NSViewCompositeFilter"
>
<object
class=
"CIAdditionCompositing"
key=
"NSViewCompositeFilter"
>
...
...
modules/gui/macosx/MainWindow.m
View file @
ebab71b5
...
@@ -411,16 +411,16 @@ static VLCMainWindow *_o_sharedInstance = nil;
...
@@ -411,16 +411,16 @@ static VLCMainWindow *_o_sharedInstance = nil;
[
o_video_view
setFrame
:
winrect
];
[
o_video_view
setFrame
:
winrect
];
previousSavedFrame
=
winrect
;
previousSavedFrame
=
winrect
;
[
self
display
];
}
else
[
o_video_view
setFrame
:
[
o_split_view
frame
]];
if
(
OSX_LION
)
if
(
OSX_LION
)
[
o_resize_view
setImage
:
NULL
];
[
o_resize_view
setImage
:
NULL
];
if
([
self
styleMask
]
&
NSResizableWindowMask
)
if
([
self
styleMask
]
&
NSResizableWindowMask
)
[
o_resize_view
removeFromSuperviewWithoutNeedingDisplay
];
[
o_resize_view
removeFromSuperviewWithoutNeedingDisplay
];
[
self
display
];
}
else
[
o_video_view
setFrame
:
[
o_split_view
frame
]];
}
}
#pragma mark -
#pragma mark -
...
@@ -521,13 +521,11 @@ static VLCMainWindow *_o_sharedInstance = nil;
...
@@ -521,13 +521,11 @@ static VLCMainWindow *_o_sharedInstance = nil;
if
([
o_video_view
isHidden
]
&&
[
o_playlist_btn
isEnabled
])
{
if
([
o_video_view
isHidden
]
&&
[
o_playlist_btn
isEnabled
])
{
[
o_split_view
setHidden
:
YES
];
[
o_split_view
setHidden
:
YES
];
[
o_video_view
setHidden
:
NO
];
[
o_video_view
setHidden
:
NO
];
NSLog
(
@"showing pl"
);
}
}
else
else
{
{
[
o_video_view
setHidden
:
YES
];
[
o_video_view
setHidden
:
YES
];
[
o_split_view
setHidden
:
NO
];
[
o_split_view
setHidden
:
NO
];
NSLog
(
@"show vout"
);
}
}
}
}
else
else
...
@@ -1021,7 +1019,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
...
@@ -1021,7 +1019,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
-
(
void
)
drawFancyGradientEffectForTimeSlider
-
(
void
)
drawFancyGradientEffectForTimeSlider
{
{
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
float
f_value
=
([
o_time_sld
frame
].
size
.
width
-
[
o_time_sld
frame
].
origin
.
x
-
[
o_time_sld
knobPosition
])
*
-
1
.
0
;
CGFloat
f_value
=
[
o_time_sld
knobPosition
]
;
if
(
f_value
>
7
.
5
)
if
(
f_value
>
7
.
5
)
{
{
NSRect
oldFrame
=
[
o_time_sld_fancygradient_view
frame
];
NSRect
oldFrame
=
[
o_time_sld_fancygradient_view
frame
];
...
...
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