diff options
| author | augustss <augustss> | 2005-01-03 16:19:32 +0000 |
|---|---|---|
| committer | augustss <augustss> | 2005-01-03 16:19:32 +0000 |
| commit | b45a3b319cecb4854167815dab936bc6a4ec988a (patch) | |
| tree | 099260099523e461bdcf314e20fabf10e8836cde /x11/wxGTK | |
| parent | 30ac9511a5fa1bab9206d2bd32aa65039bc58354 (diff) | |
| download | pkgsrc-b45a3b319cecb4854167815dab936bc6a4ec988a.tar.gz | |
Implement descent calculation in GetTextExtent. From 2.5.3.
Diffstat (limited to 'x11/wxGTK')
| -rw-r--r-- | x11/wxGTK/distinfo | 4 | ||||
| -rw-r--r-- | x11/wxGTK/patches/patch-ae | 15 | ||||
| -rw-r--r-- | x11/wxGTK/patches/patch-af | 15 |
3 files changed, 33 insertions, 1 deletions
diff --git a/x11/wxGTK/distinfo b/x11/wxGTK/distinfo index 664fbbb748e..cead91b6677 100644 --- a/x11/wxGTK/distinfo +++ b/x11/wxGTK/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2004/05/19 15:16:39 drochner Exp $ +$NetBSD: distinfo,v 1.15 2005/01/03 16:19:32 augustss Exp $ SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c Size (wxGTK-2.4.2.tar.bz2) = 5381935 bytes @@ -6,3 +6,5 @@ SHA1 (patch-aa) = 82b31569686773cbdc2200417bed6a376fb12b29 SHA1 (patch-ab) = 55f61ebaa77aeea5bfe447b974a1f18e87917300 SHA1 (patch-ac) = 01aa0bea28f838680cce6326fa67700b12f75d86 SHA1 (patch-ad) = 809a12f89b018373910b31442dfd315276cafbdf +SHA1 (patch-ae) = 8c4c8fd6e644466af181be1694921aeb14580383 +SHA1 (patch-af) = 0310ad28ee99580ce822c09dcce2a8df899fd0f5 diff --git a/x11/wxGTK/patches/patch-ae b/x11/wxGTK/patches/patch-ae new file mode 100644 index 00000000000..f805a0c5301 --- /dev/null +++ b/x11/wxGTK/patches/patch-ae @@ -0,0 +1,15 @@ +--- src/gtk/dcclient.cpp.orig 2003-09-21 13:31:57.000000000 +0200 ++++ src/gtk/dcclient.cpp 2005-01-02 14:11:00.000000000 +0100 +@@ -1666,8 +1666,10 @@ + if (height) (*height) = (wxCoord) h; + if (descent) + { +- // Do something about metrics here. TODO. +- (*descent) = 0; ++ PangoLayoutIter *iter = pango_layout_get_iter(layout); ++ int baseline = pango_layout_iter_get_baseline(iter); ++ pango_layout_iter_free(iter); ++ *descent = h - PANGO_PIXELS(baseline); + } + if (externalLeading) (*externalLeading) = 0; // ?? + diff --git a/x11/wxGTK/patches/patch-af b/x11/wxGTK/patches/patch-af new file mode 100644 index 00000000000..9a67895ce5c --- /dev/null +++ b/x11/wxGTK/patches/patch-af @@ -0,0 +1,15 @@ +--- src/gtk/window.cpp.orig 2003-09-21 13:31:58.000000000 +0200 ++++ src/gtk/window.cpp 2005-01-02 14:11:08.000000000 +0100 +@@ -3448,8 +3448,10 @@ + if (y) (*y) = (wxCoord) (rect.height / PANGO_SCALE); + if (descent) + { +- // Do something about metrics here +- (*descent) = 0; ++ PangoLayoutIter *iter = pango_layout_get_iter(layout); ++ int baseline = pango_layout_iter_get_baseline(iter); ++ pango_layout_iter_free(iter); ++ *descent = *y - PANGO_PIXELS(baseline); + } + if (externalLeading) (*externalLeading) = 0; // ?? + |