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

unified Pango GetTextExtent implementations

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-07-13 11:33:01 +00:00
parent a43ed08aa8
commit fd43b1b3ea
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/generic/dcpsg.cpp
View File

@@ -2086,17 +2086,18 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata ); const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
#endif #endif
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
PangoRectangle rect; PangoRectangle rect;
pango_layout_line_get_extents(line, NULL, &rect); pango_layout_get_extents(layout, NULL, &rect);
if (x) (*x) = (wxCoord) ( rect.width / PANGO_SCALE / scale ); if (x) (*x) = (wxCoord) ( PANGO_PIXELS(rect.width) / scale );
if (y) (*y) = (wxCoord) ( rect.height / PANGO_SCALE / scale ); if (y) (*y) = (wxCoord) ( PANGO_PIXELS(rect.height) / scale );
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) / scale;
} }
if (externalLeading) (*externalLeading) = 0; // ?? if (externalLeading) (*externalLeading) = 0; // ??

3
src/gtk/window.cpp
View File

@@ -3575,10 +3575,9 @@ 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 = pango_layout_get_line(layout, 0);
PangoRectangle rect; PangoRectangle rect;
pango_layout_line_get_extents(line, NULL, &rect); pango_layout_get_extents(layout, NULL, &rect);
if (x) (*x) = (wxCoord) PANGO_PIXELS(rect.width); if (x) (*x) = (wxCoord) PANGO_PIXELS(rect.width);
if (y) (*y) = (wxCoord) PANGO_PIXELS(rect.height); if (y) (*y) = (wxCoord) PANGO_PIXELS(rect.height);

3
src/gtk1/window.cpp
View File

@@ -3575,10 +3575,9 @@ 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 = pango_layout_get_line(layout, 0);
PangoRectangle rect; PangoRectangle rect;
pango_layout_line_get_extents(line, NULL, &rect); pango_layout_get_extents(layout, NULL, &rect);
if (x) (*x) = (wxCoord) PANGO_PIXELS(rect.width); if (x) (*x) = (wxCoord) PANGO_PIXELS(rect.width);
if (y) (*y) = (wxCoord) PANGO_PIXELS(rect.height); if (y) (*y) = (wxCoord) PANGO_PIXELS(rect.height);