diff options
| author | Dan Gudmundsson <[email protected]> | 2019-08-09 12:53:45 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2019-08-09 12:53:45 +0200 |
| commit | 3a32e5a726b24570e238a01d5a0eb026fc35a359 (patch) | |
| tree | 2bc9da9332350df71f78704fa4a1cfe3a0db9f08 /lib/observer/src/cdv_html_wx.erl | |
| parent | d48dd93bee87d039b80553031e7fe6625feff908 (diff) | |
| parent | 1274131e7dbfe0d351b7bc6a99bdd8198a673385 (diff) | |
| download | otp-3a32e5a726b24570e238a01d5a0eb026fc35a359.tar.gz otp-3a32e5a726b24570e238a01d5a0eb026fc35a359.tar.bz2 otp-3a32e5a726b24570e238a01d5a0eb026fc35a359.zip | |
Merge branch 'dgud/observer/fix-darkmode/OTP-15916' into maint
* dgud/observer/fix-darkmode/OTP-15916:
observer: Fixes for html viewers
observer: Support darkmode gui
Diffstat (limited to 'lib/observer/src/cdv_html_wx.erl')
| -rw-r--r-- | lib/observer/src/cdv_html_wx.erl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/observer/src/cdv_html_wx.erl b/lib/observer/src/cdv_html_wx.erl index 8956173c93..33cd0c9fd1 100644 --- a/lib/observer/src/cdv_html_wx.erl +++ b/lib/observer/src/cdv_html_wx.erl @@ -30,7 +30,8 @@ %% Records -record(state, - {panel, + {parent, + panel, app, %% which tool is the user expand_table, expand_wins=[], @@ -62,7 +63,7 @@ init(ParentWin, HtmlText, Tab, App) -> HtmlWin = observer_lib:html_window(ParentWin), wxHtmlWindow:setPage(HtmlWin,HtmlText), wx_misc:endBusyCursor(), - {HtmlWin, #state{panel=HtmlWin,expand_table=Tab,app=App}}. + {HtmlWin, #state{parent=ParentWin, panel=HtmlWin,expand_table=Tab,app=App}}. init(ParentWin, Callback) -> {HtmlWin, State} = init(ParentWin, "", undefined, cdv), @@ -70,12 +71,15 @@ init(ParentWin, Callback) -> %%%%%%%%%%%%%%%%%%%%%%% Callbacks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -handle_info(active, #state{panel=HtmlWin,delayed_fetch=Callback}=State) +handle_info(active, #state{parent=Parent, panel=HtmlWin,delayed_fetch=Callback}=State) when Callback=/=undefined -> observer_lib:display_progress_dialog(HtmlWin, "Crashdump Viewer", "Reading data"), - {{expand,HtmlText,Tab},TW} = Callback:get_info(), + {{expand,Title,Info,Tab},TW} = Callback:get_info(), + Cs = observer_lib:colors(Parent), + HtmlText = observer_html_lib:expandable_term(Title,Info,Tab,Cs), + observer_lib:sync_destroy_progress_dialog(), wx_misc:beginBusyCursor(), wxHtmlWindow:setPage(HtmlWin,HtmlText), |