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
2a60d695
Commit
2a60d695
authored
Mar 21, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
text_style/renderer: unify default font size
parent
39401931
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
include/vlc_text_style.h
include/vlc_text_style.h
+2
-0
modules/text_renderer/text_renderer.c
modules/text_renderer/text_renderer.c
+2
-2
src/misc/text_style.c
src/misc/text_style.c
+1
-1
No files found.
include/vlc_text_style.h
View file @
2a60d695
...
@@ -77,6 +77,8 @@ typedef struct
...
@@ -77,6 +77,8 @@ typedef struct
#define STYLE_UNDERLINE 32
#define STYLE_UNDERLINE 32
#define STYLE_STRIKEOUT 64
#define STYLE_STRIKEOUT 64
#define STYLE_DEFAULT_FONT_SIZE 22
/**
/**
* Create a default text style
* Create a default text style
*/
*/
...
...
modules/text_renderer/text_renderer.c
View file @
2a60d695
...
@@ -325,7 +325,7 @@ int HandleFontAttributes( xml_reader_t *p_xml_reader,
...
@@ -325,7 +325,7 @@ int HandleFontAttributes( xml_reader_t *p_xml_reader,
uint32_t
i_font_color
=
0xffffff
;
uint32_t
i_font_color
=
0xffffff
;
int
i_font_alpha
=
255
;
int
i_font_alpha
=
255
;
uint32_t
i_karaoke_bg_color
=
0x00ffffff
;
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
/* Default all attributes to the top font in the stack -- in case not
* all attributes are specified in the sub-font
* all attributes are specified in the sub-font
...
@@ -411,7 +411,7 @@ int HandleTT(font_stack_t **p_fonts, const char *p_fontfamily )
...
@@ -411,7 +411,7 @@ int HandleTT(font_stack_t **p_fonts, const char *p_fontfamily )
char
*
psz_unused_fontname
=
NULL
;
char
*
psz_unused_fontname
=
NULL
;
uint32_t
i_font_color
=
0xffffff
;
uint32_t
i_font_color
=
0xffffff
;
uint32_t
i_karaoke_bg_color
=
0x00ffffff
;
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
/* Default all attributes to the top font in the stack -- in case not
* all attributes are specified in the sub-font
* all attributes are specified in the sub-font
...
...
src/misc/text_style.c
View file @
2a60d695
...
@@ -38,7 +38,7 @@ text_style_t *text_style_New( void )
...
@@ -38,7 +38,7 @@ text_style_t *text_style_New( void )
/* initialize to default text style */
/* initialize to default text style */
p_style
->
psz_fontname
=
NULL
;
p_style
->
psz_fontname
=
NULL
;
p_style
->
psz_monofontname
=
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_color
=
0xffffff
;
p_style
->
i_font_alpha
=
0xff
;
p_style
->
i_font_alpha
=
0xff
;
p_style
->
i_style_flags
=
STYLE_OUTLINE
;
p_style
->
i_style_flags
=
STYLE_OUTLINE
;
...
...
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