Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
863f310d
Commit
863f310d
authored
Jul 23, 2013
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fix visual appearance of fullscreen tic (refs #8628)
parent
e61c78e6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
14 deletions
+28
-14
modules/gui/macosx/fspanel.m
modules/gui/macosx/fspanel.m
+7
-0
modules/gui/macosx/misc.h
modules/gui/macosx/misc.h
+2
-0
modules/gui/macosx/misc.m
modules/gui/macosx/misc.m
+19
-14
No files found.
modules/gui/macosx/fspanel.m
View file @
863f310d
...
...
@@ -739,5 +739,12 @@
[
self
drawKnobInRect
:
knobRect
];
}
-
(
void
)
drawFullVolBezierPath
:(
NSBezierPath
*
)
bezierPath
{
CGFloat
fullVolPos
=
[
self
fullVolumePos
];
[
bezierPath
moveToPoint
:
NSMakePoint
(
fullVolPos
,
[
self
frame
].
size
.
height
)];
[
bezierPath
lineToPoint
:
NSMakePoint
(
fullVolPos
,
1
.)];
}
@end
modules/gui/macosx/misc.h
View file @
863f310d
...
...
@@ -129,6 +129,8 @@
-
(
void
)
scrollWheel
:(
NSEvent
*
)
o_event
;
-
(
void
)
drawFullVolumeMarker
;
-
(
CGFloat
)
fullVolumePos
;
@end
/*****************************************************************************
...
...
modules/gui/macosx/misc.m
View file @
863f310d
...
...
@@ -551,8 +551,6 @@ void _drawFrameInRect(NSRect frameRect)
if
(
maxAudioVol
<
1
.)
return
;
NSRect
frame
=
[
self
frame
];
NSColor
*
drawingColor
;
// for bright artwork, a black color is used and vice versa
if
(
_usesBrightArtwork
)
...
...
@@ -561,21 +559,28 @@ void _drawFrameInRect(NSRect frameRect)
drawingColor
=
[[
NSColor
whiteColor
]
colorWithAlphaComponent
:.
4
];
NSBezierPath
*
bezierPath
=
[
NSBezierPath
bezierPath
];
CGFloat
sliderRange
=
frame
.
size
.
width
-
[
self
knobThickness
];
CGFloat
sliderOrigin
=
[
self
knobThickness
]
/
2
.;
CGFloat
fullVolPos
=
1
.
/
maxAudioVol
*
sliderRange
+
sliderOrigin
;
[
bezierPath
moveToPoint
:
NSMakePoint
(
fullVolPos
,
frame
.
size
.
height
-
3
.)];
[
bezierPath
lineToPoint
:
NSMakePoint
(
fullVolPos
,
2
.)];
[
self
drawFullVolBezierPath
:
bezierPath
];
[
bezierPath
closePath
];
bezierPath
.
lineWidth
=
1
.;
[
drawingColor
setStroke
];
[
bezierPath
stroke
];
[
drawingColor
setFill
];
[
bezierPath
fill
];
}
-
(
CGFloat
)
fullVolumePos
{
CGFloat
maxAudioVol
=
self
.
maxValue
/
AOUT_VOLUME_DEFAULT
;
CGFloat
sliderRange
=
[
self
frame
].
size
.
width
-
[
self
knobThickness
];
CGFloat
sliderOrigin
=
[
self
knobThickness
]
/
2
.;
return
1
.
/
maxAudioVol
*
sliderRange
+
sliderOrigin
;
}
-
(
void
)
drawFullVolBezierPath
:(
NSBezierPath
*
)
bezierPath
{
CGFloat
fullVolPos
=
[
self
fullVolumePos
];
[
bezierPath
moveToPoint
:
NSMakePoint
(
fullVolPos
,
[
self
frame
].
size
.
height
-
3
.)];
[
bezierPath
lineToPoint
:
NSMakePoint
(
fullVolPos
,
2
.)];
}
@end
...
...
@@ -641,7 +646,7 @@ void _drawFrameInRect(NSRect frameRect)
@"NO"
,
@"DisplayTimeAsTimeRemaining"
,
@"YES"
,
@"DisplayFullscreenTimeAsTimeRemaining"
,
nil
];
[
defaults
registerDefaults
:
appDefaults
];
}
...
...
@@ -651,7 +656,7 @@ void _drawFrameInRect(NSRect frameRect)
textAlignment
=
NSCenterTextAlignment
;
o_remaining_identifier
=
@""
;
}
return
self
;
}
...
...
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