diff options
| author | Dan Gudmundsson <[email protected]> | 2012-11-21 12:57:11 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-01-09 11:44:28 +0100 |
| commit | 394b8bf829371b6a6f69854eac35d20ad0232814 (patch) | |
| tree | cec3423c79a4eba81bac5f13dbad87891cf50072 /lib/observer | |
| parent | ae412569d12eff642b5eaaf55915ea8cda9dce0b (diff) | |
| download | otp-394b8bf829371b6a6f69854eac35d20ad0232814.tar.gz otp-394b8bf829371b6a6f69854eac35d20ad0232814.tar.bz2 otp-394b8bf829371b6a6f69854eac35d20ad0232814.zip | |
observer: Fix font sizes
On wxWidgets 2.9 they seem to have fixed font sizes in GC's
Diffstat (limited to 'lib/observer')
| -rw-r--r-- | lib/observer/src/observer_app_wx.erl | 3 | ||||
| -rw-r--r-- | lib/observer/src/observer_perf_wx.erl | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/observer/src/observer_app_wx.erl b/lib/observer/src/observer_app_wx.erl index 380532e90c..b574307007 100644 --- a/lib/observer/src/observer_app_wx.erl +++ b/lib/observer/src/observer_app_wx.erl @@ -115,8 +115,9 @@ init([Notebook, Parent]) -> end, UseGC = haveGC(DrawingArea), + Version28 = ?wxMAJOR_VERSION =:= 2 andalso ?wxMINOR_VERSION =:= 8, Font = case os:type() of - {unix,_} when UseGC -> + {unix,_} when UseGC, Version28 -> wxFont:new(12,?wxFONTFAMILY_DECORATIVE,?wxFONTSTYLE_NORMAL,?wxFONTWEIGHT_NORMAL); _ -> wxSystemSettings:getFont(?wxSYS_DEFAULT_GUI_FONT) diff --git a/lib/observer/src/observer_perf_wx.erl b/lib/observer/src/observer_perf_wx.erl index abf90ac612..d0dd46b402 100644 --- a/lib/observer/src/observer_perf_wx.erl +++ b/lib/observer/src/observer_perf_wx.erl @@ -91,10 +91,11 @@ init([Notebook, Parent]) -> end, UseGC = haveGC(Panel), + Version28 = ?wxMAJOR_VERSION =:= 2 andalso ?wxMINOR_VERSION =:= 8, {Font, SmallFont} = case os:type() of - {unix, _} when UseGC -> - %% Def font is really small when using Graphics contexts for some reason + {unix, _} when UseGC, Version28 -> + %% Def font is really small when using Graphics contexts in 2.8 %% Hardcode it F = wxFont:new(12,?wxFONTFAMILY_DECORATIVE,?wxFONTSTYLE_NORMAL,?wxFONTWEIGHT_BOLD), SF = wxFont:new(10, ?wxFONTFAMILY_DECORATIVE, ?wxFONTSTYLE_NORMAL, ?wxFONTWEIGHT_NORMAL), |