Wireshark-commits: [Wireshark-commits] master-2.0 aa16686: Clamp zooming so that we don't get zero
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 12 Dec 2015 01:02:20 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=aa1668673b64a93721693bec4587a614b5078214
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

aa16686 by Guy Harris (guy@xxxxxxxxxxxx):

    Clamp zooming so that we don't get zero or negative font sizes.
    
    Those are obviously wrong.
    
    Also, clean up some stuff left over from the GTK+ 1.x days; GTK+ 2.x
    doesn't expose raw XLFD font names, it lets you specify a font by name
    and size, and font_zoom() doesn't determine whether the font is
    resizeable - it just constructs a new font name/size pair and leaves it
    up to its callers to try to load the font, so "there's no such font as
    Wingdings Gothic" and "you can't blow up Fraktur to 10 million points"
    both show up as errors loading the font by name.
    
    Bug: 8854
    Change-Id: I6af142c75c9ebabd1a95308c203f8cb1f36dd82f
    Reviewed-on: https://code.wireshark.org/review/12549
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit b8b77aecc38f8ada88de78939e4d35d0fa535bd4)
    Reviewed-on: https://code.wireshark.org/review/12550
    

Actions performed:

    from  66bbc40   Lua: Check for empty name in ProtoField
    adds  aa16686   Clamp zooming so that we don't get zero or negative font sizes.


Summary of changes:
 ui/gtk/font_utils.c       |   28 +++++++++-------------------
 ui/gtk/font_utils.h       |    2 +-
 ui/gtk/main.c             |    8 +++++---
 ui/gtk/prefs_font_color.c |    5 ++---
 4 files changed, 17 insertions(+), 26 deletions(-)