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

Use faster function to retrieve a line from the paragraph

Browse Source 
Because contents of the retrieved line is not going to be modified, faster
read-only function can be used for retrieval.
This commit is contained in:
Artur Wieczorek
2017-05-29 20:31:42 +02:00
parent 136f909f58
commit 2afd8bfcaf
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gtk/window.cpp
View File

@@ -3421,7 +3421,17 @@ int wxWindowGTK::GetCharHeight() const
PangoLayout *layout = pango_layout_new(context); PangoLayout *layout = pango_layout_new(context);
pango_layout_set_font_description(layout, desc); pango_layout_set_font_description(layout, desc);
pango_layout_set_text(layout, "H", 1); pango_layout_set_text(layout, "H", 1);
PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data; PangoLayoutLine* line;
#if PANGO_VERSION_CHECK(1,16,0)
if ( wx_pango_version_check(1,16,0) == NULL )
{
line = pango_layout_get_line_readonly(layout, 0);
}
else
#endif // Pango 1.16+
{
line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
}
PangoRectangle rect; PangoRectangle rect;
pango_layout_line_get_extents(line, NULL, &rect); pango_layout_line_get_extents(line, NULL, &rect);
@@ -3447,7 +3457,17 @@ int wxWindowGTK::GetCharWidth() const
PangoLayout *layout = pango_layout_new(context); PangoLayout *layout = pango_layout_new(context);
pango_layout_set_font_description(layout, desc); pango_layout_set_font_description(layout, desc);
pango_layout_set_text(layout, "g", 1); pango_layout_set_text(layout, "g", 1);
PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data; PangoLayoutLine* line;
#if PANGO_VERSION_CHECK(1,16,0)
if ( wx_pango_version_check(1,16,0) == NULL )
{
line = pango_layout_get_line_readonly(layout, 0);
}
else
#endif // Pango 1.16+
{
line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
}
PangoRectangle rect; PangoRectangle rect;
pango_layout_line_get_extents(line, NULL, &rect); pango_layout_line_get_extents(line, NULL, &rect);