add autowrapping to Yast2::Popup class

yast · Dec 8, 2020 · db877be · db877be
1 parent f7e1172
commit db877be
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/library/general/example/popup_serie.rb b/library/general/example/popup_serie.rb
@@ -4,6 +4,8 @@
 
 Yast2::Popup.show("Simple text")
 
+Yast2::Popup.show("First paragraph.\n\n" + "Long text without newlines. " * 50)
+
 Yast2::Popup.show("Long text\n" * 50)
 
 Yast2::Popup.show("Simple text with details", details: "More details here")

diff --git a/library/general/src/lib/yast2/popup.rb b/library/general/src/lib/yast2/popup.rb
@@ -23,6 +23,10 @@ class << self
       RICHTEXT_WIDTH = 60
       RICHTEXT_HEIGHT = 10
 
+      # Minimum width for auto wrapped labels. It is computed that max line or this
+      # value is used to ensure that it is reasonable wrapped.
+      LABEL_MINWIDTH = 60
+
       # Show a popup, wait for a button press (or a timeout), return the button ID.
       # @param message [String] message to show. The only mandatory argument.
       # @param details [String] details that will be shown in another popup
@@ -175,7 +179,8 @@ def message_widget(message, richtext)
         elsif message.lines.size >= LINES_THRESHOLD
           message_widget(plain_to_richtext(message), true)
         else
-          Left(Label(message))
+          width = [LABEL_MINWIDTH, message.lines.map(&:size).max].min
+          MinWidth(width, Left(Label(Opt(:autoWrap), message)))
         end
       end