From fcba8982172d0fd33645178d8081ce3b96549700 Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter.hartmann@intopalo.com>
Date: Wed, 21 Mar 2018 13:00:24 +0100
Subject: [PATCH] fix layout

---
 src/controls/QskInputPanel.cpp | 50 ++++++++++++++++++++++++++--------
 src/controls/QskInputPanel.h   |  5 +++-
 2 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/src/controls/QskInputPanel.cpp b/src/controls/QskInputPanel.cpp
index 5be42f36..cea57709 100644
--- a/src/controls/QskInputPanel.cpp
+++ b/src/controls/QskInputPanel.cpp
@@ -176,6 +176,11 @@ QskAspect::Subcontrol QskKeyButton::effectiveSubcontrol( QskAspect::Subcontrol s
     return subControl;
 }
 
+int QskKeyButton::keyIndex() const
+{
+    return m_keyIndex;
+}
+
 void QskKeyButton::updateText()
 {
     QString text = m_inputPanel->currentTextForKeyIndex( m_keyIndex );
@@ -207,6 +212,7 @@ class QskInputPanel::PrivateData
             selectedGroup( -1 ),
             candidateOffset( 0 ),
             repeatKeyTimerId( -1 ),
+            buttonsBox( nullptr ),
             isUIInitialized( false )
         {
         }
@@ -229,6 +235,7 @@ class QskInputPanel::PrivateData
         std::unordered_map< int, KeyCounter > activeKeys;
         KeyTable keyTable[ ModeCount ];
 
+        QskLinearBox* buttonsBox;
         QList< QskKeyButton* > keyButtons;
         bool isUIInitialized;
 };
@@ -670,24 +677,47 @@ bool QskInputPanel::eventFilter( QObject* object, QEvent* event )
     }
 }
 
+void QskInputPanel::updateLayout()
+{
+    if( m_data->buttonsBox == nullptr )
+        return; // UI not initialized
+
+    QMarginsF margins = marginsHint( Panel | QskAspect::Margin );
+    QRectF rect = keyboardRect().marginsRemoved( margins );
+    qreal verticalSpacing = m_data->buttonsBox->spacing();
+
+    for( QQuickItem* rowItem : m_data->buttonsBox->childItems() )
+    {
+        QskLinearBox* rowBox = qobject_cast< QskLinearBox* >( rowItem );
+        qreal horizontalSpacing = rowBox->spacing();
+
+        for( QQuickItem* keyItem : rowBox->childItems() )
+        {
+            QskKeyButton* button = qobject_cast< QskKeyButton* >( keyItem );
+            QRectF keyRect = keyDataAt( button->keyIndex() ).rect;
+            qreal width = keyRect.width() * rect.width() - horizontalSpacing;
+            qreal height = keyRect.height() * rect.height() - verticalSpacing;
+
+            button->setFixedSize( width, height );
+        }
+    }
+}
+
 void QskInputPanel::createUI()
 {
+    // ### no need to defer:
     // deferring the UI creation until we are visible so that the contentsRect() returns the proper value
 
     setAutoLayoutChildren( true );
 
     auto& panelKeyData = keyData();
 
-    const auto contentsRect = keyboardRect();
-    const qreal sx = contentsRect.size().width();
-    const qreal sy = contentsRect.size().height();
-
-    QskLinearBox* outterBox = new QskLinearBox( Qt::Vertical, this );
-    outterBox->setAutoAddChildren( true );
+    m_data->buttonsBox = new QskLinearBox( Qt::Vertical, this );
+    m_data->buttonsBox->setAutoAddChildren( true );
 
     for( const auto& keyRow : panelKeyData )
     {
-        QskLinearBox* rowBox = new QskLinearBox( Qt::Horizontal, outterBox );
+        QskLinearBox* rowBox = new QskLinearBox( Qt::Horizontal, m_data->buttonsBox );
         rowBox->setAutoAddChildren( true );
 
         for( const auto& keyData : keyRow )
@@ -697,15 +727,11 @@ void QskInputPanel::createUI()
                 continue;
             }
 
-            const QSizeF buttonSize( keyData.rect.width() * sx, keyData.rect.height() * sy );
-
             int keyIndex = m_data->keyTable[ m_data->mode ].indexOf( &keyData );
             QskKeyButton* button = new QskKeyButton( keyIndex, this, rowBox );
 
             button->installEventFilter( this );
 
-            button->setMaximumWidth( buttonSize.width() ); // ### set min width as well?
-            button->setFixedHeight( buttonSize.height() );
             m_data->keyButtons.append( button );
         }
     }
@@ -713,7 +739,7 @@ void QskInputPanel::createUI()
 
 void QskInputPanel::updateUI()
 {
-    for( QskKeyButton* button : m_data->keyButtons )
+    for( QskKeyButton* button : qskAsConst( m_data->keyButtons ) )
     {
         button->updateText();
     }
diff --git a/src/controls/QskInputPanel.h b/src/controls/QskInputPanel.h
index d5fb7d35..a514bb1f 100644
--- a/src/controls/QskInputPanel.h
+++ b/src/controls/QskInputPanel.h
@@ -26,6 +26,8 @@ class QskKeyButton : public QskPushButton // ### rename to QskInputButton or so?
 
         virtual QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol subControl ) const override;
 
+        int keyIndex() const;
+
     public Q_SLOTS:
         void updateText();
 
@@ -43,7 +45,7 @@ class QSK_EXPORT QskInputPanel : public QskControl
     Q_PROPERTY( QRectF keyboardRect READ keyboardRect NOTIFY keyboardRectChanged )
 
     Q_PROPERTY( QString displayLanguageName READ displayLanguageName
-                NOTIFY displayLanguageNameChanged )
+            NOTIFY displayLanguageNameChanged )
 
     using Inherited = QskControl;
 
@@ -123,6 +125,7 @@ protected:
     virtual void geometryChanged( const QRectF&, const QRectF& ) override;
     virtual void timerEvent( QTimerEvent* ) override;
     virtual bool eventFilter( QObject* object, QEvent* event ) override;
+    virtual void updateLayout() override;
 
 private:
     void createUI();