Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
c348360a
Commit
c348360a
authored
Oct 02, 2013
by
Jan Djärv
Browse files
* macfont.m (macfont_draw): Use s->ybase for correct y position.
parent
1a23cd48
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
src/ChangeLog
src/ChangeLog
+6
-0
src/macfont.m
src/macfont.m
+2
-4
No files found.
src/ChangeLog
View file @
c348360a
2013-10-02 Jan Djärv <jan.h.d@swipnet.se>
* macfont.m (mac_ctfont_create_preferred_family_for_attributes): Remove
unised variable (from mac-port).
(macfont_draw): Use s->ybase for correct y position.
2013-10-02 Dmitry Antipov <dmantipov@yandex.ru>
* frame.h (struct frame): Drop has_minibuffer member because...
...
...
src/macfont.m
View file @
c348360a
...
...
@@ -2720,7 +2720,7 @@ So we use CTFontDescriptorCreateMatchingFontDescriptor (no
CGFloat
font_size
=
mac_font_get_size
(
macfont
);
CGAffineTransform
atfm
;
CGFloat
advance_delta
=
0
;
int
y_draw
=
-
y
-
FONT_BASE
(
s
->
font
)
;
int
y_draw
=
-
s
->
ybase
;
int
no_antialias_p
=
(
macfont_info
->
antialias
==
MACFONT_ANTIALIAS_OFF
||
(
macfont_info
->
antialias
==
MACFONT_ANTIALIAS_DEFAULT
...
...
@@ -3321,10 +3321,8 @@ So we use CTFontDescriptorCreateMatchingFontDescriptor (no
CFStringRef
result
=
NULL
;
CFStringRef
charset_string
=
CFDictionaryGetValue
(
attributes
,
MAC_FONT_CHARACTER_SET_STRING_ATTRIBUTE
);
CFIndex
length
;
if
(
charset_string
&&
(
length
=
CFStringGetLength
(
charset_string
))
>
0
)
if
(
charset_string
&&
CFStringGetLength
(
charset_string
)
>
0
)
{
CFAttributedStringRef
attr_string
=
NULL
;
CTLineRef
ctline
=
NULL
;
...
...
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