Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
450
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
2a60d695
Commit
2a60d695
authored
11 years ago
by
François Cartegnie
Browse files
Options
Downloads
Patches
Plain Diff
text_style/renderer: unify default font size
parent
39401931
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/vlc_text_style.h
+2
-0
2 additions, 0 deletions
include/vlc_text_style.h
modules/text_renderer/text_renderer.c
+2
-2
2 additions, 2 deletions
modules/text_renderer/text_renderer.c
src/misc/text_style.c
+1
-1
1 addition, 1 deletion
src/misc/text_style.c
with
5 additions
and
3 deletions
include/vlc_text_style.h
+
2
−
0
View file @
2a60d695
...
...
@@ -77,6 +77,8 @@ typedef struct
#define STYLE_UNDERLINE 32
#define STYLE_STRIKEOUT 64
#define STYLE_DEFAULT_FONT_SIZE 22
/**
* Create a default text style
*/
...
...
This diff is collapsed.
Click to expand it.
modules/text_renderer/text_renderer.c
+
2
−
2
View file @
2a60d695
...
...
@@ -325,7 +325,7 @@ int HandleFontAttributes( xml_reader_t *p_xml_reader,
uint32_t
i_font_color
=
0xffffff
;
int
i_font_alpha
=
255
;
uint32_t
i_karaoke_bg_color
=
0x00ffffff
;
int
i_font_size
=
24
;
int
i_font_size
=
STYLE_DEFAULT_FONT_SIZE
;
/* Default all attributes to the top font in the stack -- in case not
* all attributes are specified in the sub-font
...
...
@@ -411,7 +411,7 @@ int HandleTT(font_stack_t **p_fonts, const char *p_fontfamily )
char
*
psz_unused_fontname
=
NULL
;
uint32_t
i_font_color
=
0xffffff
;
uint32_t
i_karaoke_bg_color
=
0x00ffffff
;
int
i_font_size
=
24
;
int
i_font_size
=
STYLE_DEFAULT_FONT_SIZE
;
/* Default all attributes to the top font in the stack -- in case not
* all attributes are specified in the sub-font
...
...
This diff is collapsed.
Click to expand it.
src/misc/text_style.c
+
1
−
1
View file @
2a60d695
...
...
@@ -38,7 +38,7 @@ text_style_t *text_style_New( void )
/* initialize to default text style */
p_style
->
psz_fontname
=
NULL
;
p_style
->
psz_monofontname
=
NULL
;
p_style
->
i_font_size
=
22
;
p_style
->
i_font_size
=
STYLE_DEFAULT_FONT_SIZE
;
p_style
->
i_font_color
=
0xffffff
;
p_style
->
i_font_alpha
=
0xff
;
p_style
->
i_style_flags
=
STYLE_OUTLINE
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment