diff options
| author | Dan Gudmundsson <[email protected]> | 2019-02-18 12:37:23 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2019-02-18 12:37:23 +0100 |
| commit | 1fc95bdd084d9e43e255a1962dbb562a2e1aa367 (patch) | |
| tree | 0eaf5423b445b45ed7982161b3ea8379e5d2f9a9 /lib/observer/src/observer_wx.erl | |
| parent | e25fe1d35209d321a512091018a78ee9b7cc0b64 (diff) | |
| parent | 77e83d0757d56d15f4b1bc70044b89d3eaf48b2b (diff) | |
| download | otp-1fc95bdd084d9e43e255a1962dbb562a2e1aa367.tar.gz otp-1fc95bdd084d9e43e255a1962dbb562a2e1aa367.tar.bz2 otp-1fc95bdd084d9e43e255a1962dbb562a2e1aa367.zip | |
Merge branch 'pr/2105' into maint
* pr/2105:
Add OBSERVER_SCALE environment variable for HiDPI support
OTP-15586
Diffstat (limited to 'lib/observer/src/observer_wx.erl')
| -rw-r--r-- | lib/observer/src/observer_wx.erl | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/observer/src/observer_wx.erl b/lib/observer/src/observer_wx.erl index fe51afa240..71db586845 100644 --- a/lib/observer/src/observer_wx.erl +++ b/lib/observer/src/observer_wx.erl @@ -22,7 +22,7 @@ -export([start/0, stop/0]). -export([create_menus/2, get_attrib/1, get_tracer/0, get_active_node/0, get_menubar/0, - set_status/1, create_txt_dialog/4, try_rpc/4, return_to_localnode/2]). + get_scale/0, set_status/1, create_txt_dialog/4, try_rpc/4, return_to_localnode/2]). -export([init/1, handle_event/2, handle_cast/2, terminate/2, code_change/3, handle_call/3, handle_info/2, check_page_title/1]). @@ -91,14 +91,24 @@ get_active_node() -> get_menubar() -> wx_object:call(observer, get_menubar). +get_scale() -> + ScaleStr = os:getenv("OBSERVER_SCALE", "1"), + try list_to_integer(ScaleStr) of + Scale when Scale < 1 -> 1; + Scale -> Scale + catch _:_ -> + 1 + end. + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% init(_Args) -> register(observer, self()), wx:new(), catch wxSystemOptions:setOption("mac.listctrl.always_use_generic", 1), + Scale = get_scale(), Frame = wxFrame:new(wx:null(), ?wxID_ANY, "Observer", - [{size, {850, 600}}, {style, ?wxDEFAULT_FRAME_STYLE}]), + [{size, {Scale * 850, Scale * 600}}, {style, ?wxDEFAULT_FRAME_STYLE}]), IconFile = filename:join(code:priv_dir(observer), "erlang_observer.png"), Icon = wxIcon:new(IconFile, [{type,?wxBITMAP_TYPE_PNG}]), wxFrame:setIcon(Frame, Icon), |