Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set descent in GetTextExtend; use PANGO_PIXELS instead of dividing by PANGO_SCALE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-07-01 08:56:25 +00:00
parent 1c0ee565da
commit f69e200970
4 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/dcclient.cpp
View File

@@ -1736,8 +1736,10 @@ void wxWindowDC::DoGetTextExtent(const wxString &string,
*height = (wxCoord) h; *height = (wxCoord) h;
if (descent) if (descent)
{ {
// Do something about metrics here. TODO. PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
*descent = 0; int baseline = pango_layout_iter_get_baseline(iter);
pango_layout_iter_free(iter);
*descent = h - PANGO_PIXELS(baseline);
} }
if (externalLeading) if (externalLeading)
*externalLeading = 0; // ?? *externalLeading = 0; // ??

16
src/gtk/window.cpp
View File

@@ -3484,7 +3484,7 @@ int wxWindowGTK::GetCharHeight() const
g_object_unref( G_OBJECT( layout ) ); g_object_unref( G_OBJECT( layout ) );
return (int) (rect.height / PANGO_SCALE); return (int) PANGO_PIXELS(rect.height);
#else #else
GdkFont *gfont = font.GetInternalFont( 1.0 ); GdkFont *gfont = font.GetInternalFont( 1.0 );
@@ -3518,7 +3518,7 @@ int wxWindowGTK::GetCharWidth() const
g_object_unref( G_OBJECT( layout ) ); g_object_unref( G_OBJECT( layout ) );
return (int) (rect.width / PANGO_SCALE); return (int) PANGO_PIXELS(rect.width);
#else #else
GdkFont *gfont = font.GetInternalFont( 1.0 ); GdkFont *gfont = font.GetInternalFont( 1.0 );
@@ -3569,17 +3569,19 @@ void wxWindowGTK::GetTextExtent( const wxString& string,
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
#endif #endif
} }
PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data; PangoLayoutLine *line = pango_layout_get_line(layout, 0);
PangoRectangle rect; PangoRectangle rect;
pango_layout_line_get_extents(line, NULL, &rect); pango_layout_line_get_extents(line, NULL, &rect);
if (x) (*x) = (wxCoord) (rect.width / PANGO_SCALE); if (x) (*x) = (wxCoord) PANGO_PIXELS(rect.width);
if (y) (*y) = (wxCoord) (rect.height / PANGO_SCALE); if (y) (*y) = (wxCoord) PANGO_PIXELS(rect.height);
if (descent) if (descent)
{ {
// Do something about metrics here PangoLayoutIter *iter = pango_layout_get_iter(layout);
(*descent) = 0; int baseline = pango_layout_iter_get_baseline(iter);
pango_layout_iter_free(iter);
*descent = *y - PANGO_PIXELS(baseline);
} }
if (externalLeading) (*externalLeading) = 0; // ?? if (externalLeading) (*externalLeading) = 0; // ??

6
src/gtk1/dcclient.cpp
View File

@@ -1736,8 +1736,10 @@ void wxWindowDC::DoGetTextExtent(const wxString &string,
*height = (wxCoord) h; *height = (wxCoord) h;
if (descent) if (descent)
{ {
// Do something about metrics here. TODO. PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
*descent = 0; int baseline = pango_layout_iter_get_baseline(iter);
pango_layout_iter_free(iter);
*descent = h - PANGO_PIXELS(baseline);
} }
if (externalLeading) if (externalLeading)
*externalLeading = 0; // ?? *externalLeading = 0; // ??

16
src/gtk1/window.cpp
View File

@@ -3484,7 +3484,7 @@ int wxWindowGTK::GetCharHeight() const
g_object_unref( G_OBJECT( layout ) ); g_object_unref( G_OBJECT( layout ) );
return (int) (rect.height / PANGO_SCALE); return (int) PANGO_PIXELS(rect.height);
#else #else
GdkFont *gfont = font.GetInternalFont( 1.0 ); GdkFont *gfont = font.GetInternalFont( 1.0 );
@@ -3518,7 +3518,7 @@ int wxWindowGTK::GetCharWidth() const
g_object_unref( G_OBJECT( layout ) ); g_object_unref( G_OBJECT( layout ) );
return (int) (rect.width / PANGO_SCALE); return (int) PANGO_PIXELS(rect.width);
#else #else
GdkFont *gfont = font.GetInternalFont( 1.0 ); GdkFont *gfont = font.GetInternalFont( 1.0 );
@@ -3569,17 +3569,19 @@ void wxWindowGTK::GetTextExtent( const wxString& string,
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
#endif #endif
} }
PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data; PangoLayoutLine *line = pango_layout_get_line(layout, 0);
PangoRectangle rect; PangoRectangle rect;
pango_layout_line_get_extents(line, NULL, &rect); pango_layout_line_get_extents(line, NULL, &rect);
if (x) (*x) = (wxCoord) (rect.width / PANGO_SCALE); if (x) (*x) = (wxCoord) PANGO_PIXELS(rect.width);
if (y) (*y) = (wxCoord) (rect.height / PANGO_SCALE); if (y) (*y) = (wxCoord) PANGO_PIXELS(rect.height);
if (descent) if (descent)
{ {
// Do something about metrics here PangoLayoutIter *iter = pango_layout_get_iter(layout);
(*descent) = 0; int baseline = pango_layout_iter_get_baseline(iter);
pango_layout_iter_free(iter);
*descent = *y - PANGO_PIXELS(baseline);
} }
if (externalLeading) (*externalLeading) = 0; // ?? if (externalLeading) (*externalLeading) = 0; // ??