SSH Importer: Width fix to avoid cut of CheckBoxFrame Label (#391)

* SSH Importer: Width fix to avoid cut of CheckBoxFrame Label * Added comment clarifying use of label length and bumped version
yast · Aug 17, 2016 · 5b57673 · 5b57673
1 parent 0165dd9
commit 5b57673
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Aug 16 15:34:43 UTC 2016 - kanderssen@suse.com
+
+- SSH Importer: Width fix to avoid cut of CheckBoxFrame Label
+  (fate##319624)
+- 3.1.209
+
 -------------------------------------------------------------------
 Tue Aug 16 13:28:14 CEST 2016 - locilka@suse.com
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.207
+Version:        3.1.208
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/lib/installation/dialogs/ssh_import.rb b/src/lib/installation/dialogs/ssh_import.rb
@@ -62,23 +62,30 @@ def copy_config
     end
 
     def dialog_content
+      label = _("I would like to import SSH keys from a previous installation")
       HSquash(
         VBox(
-          CheckBoxFrame(
-            Id(:import_ssh_key),
-            _("I would like to import SSH keys from a previous installation"),
-            !(importer.device.nil? || importer.device.empty?),
-            VBox(
-              HStretch(),
-              VSpacing(1),
-              HBox(
-                HSpacing(2),
-                Mode.config ? device_name : partitions_list_widget
-              ),
-              VSpacing(3),
-              HBox(
-                HSpacing(2),
-                Left(copy_config_widget)
+          # For some reason the CheckBoxFrame Label is cut if the label size
+          # exceeds the CheckBoxFrame content's width. MinWidth with label length
+          # is used to avoid this issue.
+          MinWidth(
+            label.length,
+            CheckBoxFrame(
+              Id(:import_ssh_key),
+              label,
+              !(importer.device.nil? || importer.device.empty?),
+              VBox(
+                HStretch(),
+                VSpacing(1),
+                HBox(
+                  HSpacing(2),
+                  Mode.config ? device_name : partitions_list_widget
+                ),
+                VSpacing(3),
+                HBox(
+                  HSpacing(2),
+                  Left(copy_config_widget)
+                )
               )
             )
           ),