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
55a47406
Commit
55a47406
authored
Feb 23, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: really fixed the time line drawing artifacts (close #6057)
parent
67c68a71
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
7 deletions
+11
-7
extras/package/macosx/Resources/English.lproj/MainMenu.xib
extras/package/macosx/Resources/English.lproj/MainMenu.xib
+1
-3
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+7
-2
modules/gui/macosx/misc.m
modules/gui/macosx/misc.m
+3
-2
No files found.
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @
55a47406
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
<integer
value=
"4722"
/>
<integer
value=
"4722"
/>
<integer
value=
"4850"
/>
<integer
value=
"4850"
/>
<integer
value=
"2770"
/>
<integer
value=
"2770"
/>
<integer
value=
"
21
"
/>
<integer
value=
"
4756
"
/>
<integer
value=
"29"
/>
<integer
value=
"29"
/>
<integer
value=
"2730"
/>
<integer
value=
"2730"
/>
<integer
value=
"283"
/>
<integer
value=
"283"
/>
...
@@ -672,7 +672,6 @@
...
@@ -672,7 +672,6 @@
<string
key=
"NSFrame"
>
{{218, 11}, {60, 12}}
</string>
<string
key=
"NSFrame"
>
{{218, 11}, {60, 12}}
</string>
<reference
key=
"NSSuperview"
ref=
"129808516"
/>
<reference
key=
"NSSuperview"
ref=
"129808516"
/>
<int
key=
"NSViewLayerContentsRedrawPolicy"
>
2
</int>
<int
key=
"NSViewLayerContentsRedrawPolicy"
>
2
</int>
<bool
key=
"NSViewCanDrawConcurrently"
>
YES
</bool>
<string
key=
"NSClassName"
>
VLCThreePartImageView
</string>
<string
key=
"NSClassName"
>
VLCThreePartImageView
</string>
</object>
</object>
<object
class=
"NSButton"
id=
"707945673"
>
<object
class=
"NSButton"
id=
"707945673"
>
...
@@ -1141,7 +1140,6 @@
...
@@ -1141,7 +1140,6 @@
<string
key=
"NSFrame"
>
{{-1, 0}, {605, 36}}
</string>
<string
key=
"NSFrame"
>
{{-1, 0}, {605, 36}}
</string>
<reference
key=
"NSSuperview"
ref=
"429932428"
/>
<reference
key=
"NSSuperview"
ref=
"429932428"
/>
<int
key=
"NSViewLayerContentsRedrawPolicy"
>
2
</int>
<int
key=
"NSViewLayerContentsRedrawPolicy"
>
2
</int>
<bool
key=
"NSViewCanDrawConcurrently"
>
YES
</bool>
<string
key=
"NSClassName"
>
VLCThreePartDropView
</string>
<string
key=
"NSClassName"
>
VLCThreePartDropView
</string>
</object>
</object>
</object>
</object>
...
...
modules/gui/macosx/MainWindow.m
View file @
55a47406
...
@@ -463,6 +463,11 @@ static VLCMainWindow *_o_sharedInstance = nil;
...
@@ -463,6 +463,11 @@ static VLCMainWindow *_o_sharedInstance = nil;
[
o_sidebar_scrollview
setBorderType
:
NSNoBorder
];
[
o_sidebar_scrollview
setBorderType
:
NSNoBorder
];
}
}
NSRect
frame
;
frame
=
[
o_time_sld_fancygradient_view
frame
];
frame
.
size
.
width
=
0
;
[
o_time_sld_fancygradient_view
setFrame
:
frame
];
if
(
OSX_LION
)
if
(
OSX_LION
)
[
o_resize_view
setImage
:
NULL
];
[
o_resize_view
setImage
:
NULL
];
...
@@ -1240,9 +1245,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
...
@@ -1240,9 +1245,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
NSRect
oldFrame
=
[
o_time_sld_fancygradient_view
frame
];
NSRect
oldFrame
=
[
o_time_sld_fancygradient_view
frame
];
if
(
f_value
!=
oldFrame
.
size
.
width
)
if
(
f_value
!=
oldFrame
.
size
.
width
)
{
{
[
o_time_sld_fancygradient_view
setHidden
:
NO
];
if
([
o_time_sld_fancygradient_view
isHidden
])
[
o_time_sld_fancygradient_view
setHidden
:
NO
];
[
o_time_sld_fancygradient_view
setFrame
:
NSMakeRect
(
oldFrame
.
origin
.
x
,
oldFrame
.
origin
.
y
,
f_value
,
oldFrame
.
size
.
height
)];
[
o_time_sld_fancygradient_view
setFrame
:
NSMakeRect
(
oldFrame
.
origin
.
x
,
oldFrame
.
origin
.
y
,
f_value
,
oldFrame
.
size
.
height
)];
[
o_time_sld_fancygradient_view
setNeedsDisplay
:
YES
];
}
}
}
}
else
else
...
...
modules/gui/macosx/misc.m
View file @
55a47406
...
@@ -672,6 +672,9 @@ void _drawFrameInRect(NSRect frameRect)
...
@@ -672,6 +672,9 @@ void _drawFrameInRect(NSRect frameRect)
-
(
void
)
drawRect
:(
NSRect
)
rect
-
(
void
)
drawRect
:(
NSRect
)
rect
{
{
[(
VLCMainWindow
*
)[
self
window
]
drawFancyGradientEffectForTimeSlider
];
msleep
(
10000
);
//wait for the gradient to draw completely
/* Draw default to make sure the slider behaves correctly */
/* Draw default to make sure the slider behaves correctly */
[[
NSGraphicsContext
currentContext
]
saveGraphicsState
];
[[
NSGraphicsContext
currentContext
]
saveGraphicsState
];
NSRectClip
(
NSZeroRect
);
NSRectClip
(
NSZeroRect
);
...
@@ -681,8 +684,6 @@ void _drawFrameInRect(NSRect frameRect)
...
@@ -681,8 +684,6 @@ void _drawFrameInRect(NSRect frameRect)
NSRect
knobRect
=
[[
self
cell
]
knobRectFlipped
:
NO
];
NSRect
knobRect
=
[[
self
cell
]
knobRectFlipped
:
NO
];
knobRect
.
origin
.
y
+=
1
;
knobRect
.
origin
.
y
+=
1
;
[
self
drawKnobInRect
:
knobRect
];
[
self
drawKnobInRect
:
knobRect
];
[(
VLCMainWindow
*
)[
self
window
]
drawFancyGradientEffectForTimeSlider
];
}
}
@end
@end
...
...
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