Merge pull request #129 from shundhammer/huha-auto-wrap

Auto-wrapping for YLabel Widgets (Qt Part)

VERSION.cmake

@@ -1,11 +1,11 @@
 SET(VERSION_MAJOR "2")
-SET(VERSION_MINOR "52")
-SET(VERSION_PATCH "4")
+SET(VERSION_MINOR "53")
+SET(VERSION_PATCH "0")
 SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" )
 
 ##### This is needed for the libyui-qt core ONLY.
 ##### These will be overridden from exports in LibyuiConfig.cmake
-SET( SONAME_MAJOR "11" )
+SET( SONAME_MAJOR "12" )
 SET( SONAME_MINOR "0" )
 SET( SONAME_PATCH "0" )
 SET( SONAME "${SONAME_MAJOR}.${SONAME_MINOR}.${SONAME_PATCH}" )

package/libyui-qt-doc.spec

@@ -17,11 +17,11 @@
 
 
 %define parent libyui-qt
-%define so_version 11
+%define so_version 12
 
 Name:           %{parent}-doc
 # DO NOT manually bump the version here; instead, use   rake version:bump
-Version:        2.52.4
+Version:        2.53.0
 Release:        0
 Source:         %{parent}-%{version}.tar.bz2
 

package/libyui-qt.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jun  4 11:58:01 UTC 2020 - Stefan Hundhammer <shundhammer@suse.com>
+
+- Added autoWrap to label widget (bsc#1172513)
+- Bumped SO version to 12
+- 2.53.0
+
+
 -------------------------------------------------------------------
 Wed May 20 10:00:31 UTC 2020 - Stefan Hundhammer <shundhammer@suse.com>
 

package/libyui-qt.spec

@@ -18,19 +18,19 @@
 
 Name:           libyui-qt
 # DO NOT manually bump the version here; instead, use   rake version:bump
-Version:        2.52.4
+Version:        2.53.0
 Release:        0
 Source:         %{name}-%{version}.tar.bz2
 
-%define so_version 11
+%define so_version 12
 %define bin_name %{name}%{so_version}
 
 BuildRequires:  boost-devel
 BuildRequires:  cmake >= 2.8
 BuildRequires:  gcc-c++
 BuildRequires:  pkg-config
 
-%define libyui_devel_version libyui-devel >= 3.9.1
+%define libyui_devel_version libyui-devel >= 3.10.0
 BuildRequires:  %{libyui_devel_version}
 BuildRequires:  fontconfig-devel
 BuildRequires:  pkgconfig(Qt5Core)

src/YQLabel.cc

@@ -33,6 +33,9 @@
 #include "YQApplication.h"
 #include "YQLabel.h"
 
+#define AUTO_WRAP_WIDTH  150
+#define AUTO_WRAP_HEIGHT  10
+
 using std::string;
 
 
@@ -43,6 +46,7 @@ YQLabel::YQLabel( YWidget * 		parent,
 		  bool 			isOutputField )
     : QLabel( (QWidget *) parent->widgetRep() )
     , YLabel( parent, text, isHeading, isOutputField )
+    , _layoutPass1Width( 0 )
 {
     setWidgetRep( this );
 
@@ -90,6 +94,13 @@ void YQLabel::setUseBoldFont( bool useBold )
 }
 
 
+void YQLabel::setAutoWrap( bool autoWrap )
+{
+    YLabel::setAutoWrap( autoWrap );
+    QLabel::setWordWrap( autoWrap );
+}
+
+
 void YQLabel::setEnabled( bool enabled )
 {
     QLabel::setEnabled( enabled );
@@ -99,17 +110,87 @@ void YQLabel::setEnabled( bool enabled )
 
 int YQLabel::preferredWidth()
 {
-    return sizeHint().width();
+    int width;
+
+    if ( autoWrap() )
+    {
+        if ( layoutPass() == 2 )
+        {
+            // Use the width passed down to us from the parent layout manager
+            // in the last setSize() call. This is the definitive width that
+            // will be used after taking all other children of the layout into
+            // consideration, also including making widgets smaller due to size
+            // restrictions, or redistributing excess space.
+            //
+            // Since this widget can auto-wrap its contents, we accept
+            // basically any width; we just need to adapt the preferred height
+            // accordingly.
+            width = _layoutPass1Width;
+        }
+        else
+        {
+            // Use a preliminary width. Typically, this widget should be
+            // wrapped into a MinSize or MinWidth which hopefully gives us a
+            // much more useful width than this.
+            //
+            // We would also just use 0 here, but that would make debugging
+            // really hard since the widget might completly disappear.
+            //
+            // The real width that will be used will be set in the setSize()
+            // call following the recursive preferredWidth() /
+            // preferredHeight() calls in the widget tree.
+            width = AUTO_WRAP_WIDTH;
+        }
+    }
+    else  // ! autoWrap()
+    {
+        width = sizeHint().width();
+    }
+
+    return width;
 }
 
 
 int YQLabel::preferredHeight()
 {
-    return sizeHint().height();
+    int height;
+
+    if ( autoWrap() )
+    {
+        if ( layoutPass() == 2 )
+        {
+            // This is where the magic happens:
+            //
+            // setSize() in the first layout pass gave us the real width which
+            // we stored in _layoutPass1Width. We can now calculate the height
+            // that is really needed based on that width. QLabel provides this
+            // handy function that takes word wrapping and font metrics into
+            // account (remember, we are using a proportional font, so every
+            // letter has a different width).
+
+            height = heightForWidth( _layoutPass1Width );
+        }
+        else
+        {
+            height = AUTO_WRAP_HEIGHT;
+        }
+    }
+    else  // ! autoWrap()
+    {
+        height = sizeHint().height();
+    }
+
+    return height;
 }
 
 
 void YQLabel::setSize( int newWidth, int newHeight )
 {
+    if ( autoWrap() )
+    {
+        _layoutPass1Width = layoutPass() == 1 ?
+            newWidth : 0;
+    }
+
     resize( newWidth, newHeight );
 }

src/YQLabel.h

@@ -63,6 +63,13 @@ class YQLabel : public QLabel, public YLabel
      **/
     virtual void setUseBoldFont( bool bold );
 
+    /*
+     * Enable or disable automatic word wrapping.
+     *
+     * Reimplemented from YLabel.
+     **/
+    virtual void setAutoWrap( bool autoWrap = true );
+
     /**
      * Set enabled / disabled state.
      *
@@ -90,6 +97,10 @@ class YQLabel : public QLabel, public YLabel
      * Reimplemented from YWidget.
      **/
     virtual void setSize( int newWidth, int newHeight );
+
+protected:
+
+    int _layoutPass1Width;
 };