eliminato calcolo errato della baseline in Windows
git-svn-id: svn://10.65.10.50/trunk@5771 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
parent
67efe69bfc
commit
dabe04eb31
16
xi/xitext.c
16
xi/xitext.c
@ -677,11 +677,11 @@ xi_text_draw_internal( XI_TEXT * text, XinColor color, XinColor back_color, BOOL
|
|||||||
if ( line_to_draw < text->nbr_lines - 1 )
|
if ( line_to_draw < text->nbr_lines - 1 )
|
||||||
len = xi_text_line_break_get( text, line_to_draw + 1 ) -
|
len = xi_text_line_break_get( text, line_to_draw + 1 ) -
|
||||||
xi_text_line_break_get( text, line_to_draw );
|
xi_text_line_break_get( text, line_to_draw );
|
||||||
#if XIWS == XIWS_WM
|
//#if XIWS == XIWS_WM
|
||||||
baseline = rct.top + 8;
|
// baseline = rct.top + 8;
|
||||||
#else
|
//#else
|
||||||
baseline = rct.top + text->leading + text->ascent;
|
baseline = rct.top + text->leading + text->ascent;
|
||||||
#endif
|
// #endif
|
||||||
str = &s[xi_text_line_break_get( text, line_to_draw )];
|
str = &s[xi_text_line_break_get( text, line_to_draw )];
|
||||||
if ( len == -1 )
|
if ( len == -1 )
|
||||||
len = strlen( str );
|
len = strlen( str );
|
||||||
@ -790,11 +790,11 @@ xi_text_draw_internal( XI_TEXT * text, XinColor color, XinColor back_color, BOOL
|
|||||||
str = alloc_password_string( len, text );
|
str = alloc_password_string( len, text );
|
||||||
else
|
else
|
||||||
str = text->string;
|
str = text->string;
|
||||||
#if XIWS == XI_WMWS
|
//#if XIWS == XI_WMWS
|
||||||
baseline = rct.top + 8;
|
// baseline = rct.top + 8;
|
||||||
#else
|
//#else
|
||||||
baseline = rct.top + text->leading + text->ascent;
|
baseline = rct.top + text->leading + text->ascent;
|
||||||
#endif
|
//#endif
|
||||||
dont_draw = FALSE;
|
dont_draw = FALSE;
|
||||||
if ( save_text )
|
if ( save_text )
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user