Merge branch 'siri/cdv/multi-line-slogan/ERL-318/OTP-14093' into maint

* siri/cdv/multi-line-slogan/ERL-318/OTP-14093:
  [crashdump_viewer] Allow multiple lines in Slogan

2 files changed, 24 insertions, 11 deletions

diff --git a/lib/observer/src/crashdump_viewer.erl b/lib/observer/src/crashdump_viewer.erl
index 2f9f81104a..13e73f027d 100644
--- a/lib/observer/src/crashdump_viewer.erl
+++ b/lib/observer/src/crashdump_viewer.erl
@@ -928,7 +928,10 @@ general_info(File) ->
 		  WholeLine -> WholeLine
 	      end,
 
-    GI = get_general_info(Fd,#general_info{created=Created}),
+    {Slogan,SysVsn} = get_slogan_and_sysvsn(Fd,[]),
+    GI = get_general_info(Fd,#general_info{created=Created,
+                                           slogan=Slogan,
+                                           system_vsn=SysVsn}),
 
     {MemTot,MemMax} = 
 	case lookup_index(?memory) of
@@ -982,12 +985,20 @@ general_info(File) ->
 		    mem_max=MemMax,
 		    instr_info=InstrInfo}.
 
+get_slogan_and_sysvsn(Fd,Acc) ->
+    case val(Fd,eof) of
+        "Slogan: " ++ SloganPart when Acc==[] ->
+            get_slogan_and_sysvsn(Fd,[SloganPart]);
+        "System version: " ++ SystemVsn ->
+            {lists:append(lists:reverse(Acc)),SystemVsn};
+        eof ->
+            {lists:append(lists:reverse(Acc)),"-1"};
+        SloganPart ->
+            get_slogan_and_sysvsn(Fd,[[$\n|SloganPart]|Acc])
+    end.
+
 get_general_info(Fd,GenInfo) ->
     case line_head(Fd) of
-	"Slogan" ->
-	    get_general_info(Fd,GenInfo#general_info{slogan=val(Fd)});
-	"System version" ->
-	    get_general_info(Fd,GenInfo#general_info{system_vsn=val(Fd)});
 	"Compiled" ->
 	    get_general_info(Fd,GenInfo#general_info{compile_time=val(Fd)});
 	"Taints" ->
diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl
index 59a2f9f205..1eaba31a3a 100644
--- a/lib/observer/src/observer_lib.erl
+++ b/lib/observer/src/observer_lib.erl
@@ -461,14 +461,16 @@ create_box(Parent, Data) ->
 				 link_entry(Panel,Value);
 			     _ ->
 				 Value = to_str(Value0),
-				 case length(Value) > 100 of
-				     true ->
-					 Shown = lists:sublist(Value, 80),
+                                 case string:sub_word(lists:sublist(Value, 80),1,$\n) of
+                                     Value ->
+                                         %% Short string, no newlines - show all
+					 wxStaticText:new(Panel, ?wxID_ANY, Value);
+                                     Shown ->
+                                         %% Long or with newlines,
+                                         %% use tooltip to show all
 					 TCtrl = wxStaticText:new(Panel, ?wxID_ANY, [Shown,"..."]),
 					 wxWindow:setToolTip(TCtrl,wxToolTip:new(Value)),
-					 TCtrl;
-				     false ->
-					 wxStaticText:new(Panel, ?wxID_ANY, Value)
+					 TCtrl
 				 end
 			 end,
 		     wxSizer:add(Line, 10, 0), % space of size 10 horisontally