diff --git a/src/controls/QskTabViewSkinlet.cpp b/src/controls/QskTabViewSkinlet.cpp
index fdf0b803..e2b51c7d 100644
--- a/src/controls/QskTabViewSkinlet.cpp
+++ b/src/controls/QskTabViewSkinlet.cpp
@@ -84,7 +84,7 @@ QRectF QskTabViewSkinlet::tabBarRect(
 {
     Q_UNUSED( rect )
 
-    const QSizeF hint = tabView->tabBar()->sizeHint();
+    const QSizeF barSize = tabView->tabBar()->sizeConstraint();
 
 #if 1
     QRectF r = tabView->layoutRect();
@@ -93,19 +93,19 @@ QRectF QskTabViewSkinlet::tabBarRect(
     switch( tabView->tabPosition() )
     {
         case Qsk::Top:
-            r.setHeight( hint.height() );
+            r.setHeight( barSize.height() );
             break;
 
         case Qsk::Bottom:
-            r.setTop( r.bottom() - hint.height() );
+            r.setTop( r.bottom() - barSize.height() );
             break;
 
         case Qsk::Left:
-            r.setWidth( hint.width() );
+            r.setWidth( barSize.width() );
             break;
 
         case Qsk::Right:
-            r.setLeft( r.right() - hint.width() );
+            r.setLeft( r.right() - barSize.width() );
             break;
     }
 
diff --git a/src/controls/QskWindow.cpp b/src/controls/QskWindow.cpp
index afabcef2..3a639dc4 100644
--- a/src/controls/QskWindow.cpp
+++ b/src/controls/QskWindow.cpp
@@ -244,7 +244,7 @@ bool QskWindow::event( QEvent* event )
         {
             if ( size().isEmpty() )
             {
-                QSize sz = effectivePreferredSize();
+                QSize sz = sizeConstraint();
                 if ( !sz.isEmpty() )
                 {
                     sz = sz.expandedTo( minimumSize() );
@@ -403,7 +403,7 @@ QSize QskWindow::preferredSize() const
     return d->preferredSize;
 }
 
-QSize QskWindow::effectivePreferredSize() const
+QSize QskWindow::sizeConstraint() const
 {
     Q_D( const QskWindow );
 
@@ -419,7 +419,7 @@ QSize QskWindow::effectivePreferredSize() const
         {
             if ( auto control = qskControlCast( child ) )
             {
-                const QSizeF itemConstraint = control->sizeHint();
+                const QSizeF itemConstraint = control->sizeConstraint();
 
                 if ( doWidth )
                     constraint.setWidth( qMax( constraint.width(), itemConstraint.width() ) );
diff --git a/src/controls/QskWindow.h b/src/controls/QskWindow.h
index 0a6e9d8a..d3334097 100644
--- a/src/controls/QskWindow.h
+++ b/src/controls/QskWindow.h
@@ -51,7 +51,7 @@ class QSK_EXPORT QskWindow : public QQuickWindow
     Q_INVOKABLE void setPreferredSize( const QSize& );
     Q_INVOKABLE QSize preferredSize() const;
 
-    Q_INVOKABLE QSize effectivePreferredSize() const;
+    Q_INVOKABLE QSize sizeConstraint() const;
 
     Q_INVOKABLE void setFixedSize( const QSize& );
 
diff --git a/src/dialogs/QskDialog.cpp b/src/dialogs/QskDialog.cpp
index db6fee4c..cab266e3 100644
--- a/src/dialogs/QskDialog.cpp
+++ b/src/dialogs/QskDialog.cpp
@@ -102,7 +102,7 @@ static void qskSetupWindow(
 
     window->setModality( transientParent ? Qt::WindowModal : Qt::ApplicationModal );
 
-    const QSize size = window->effectivePreferredSize();
+    const QSize size = window->sizeConstraint();
 
     if ( window->parent() )
     {
diff --git a/src/dialogs/QskDialogSubWindow.cpp b/src/dialogs/QskDialogSubWindow.cpp
index 52478eeb..5e0492cc 100644
--- a/src/dialogs/QskDialogSubWindow.cpp
+++ b/src/dialogs/QskDialogSubWindow.cpp
@@ -353,7 +353,7 @@ void QskDialogSubWindow::aboutToShow()
         const qreal cy = 0.5 * parentItem()->height();
 
         QRectF rect;
-        rect.setSize( sizeHint() );
+        rect.setSize( sizeConstraint() );
         rect.moveCenter( QPointF( cx, cy ) );
 
         setGeometry( rect );
@@ -370,7 +370,7 @@ void QskDialogSubWindow::updateLayout()
 
     if ( m_data->buttonBox && m_data->buttonBox->isVisibleToParent() )
     {
-        const auto h = m_data->buttonBox->sizeHint().height();
+        const auto h = m_data->buttonBox->sizeConstraint().height();
         rect.setBottom( rect.bottom() - h );
 
         m_data->buttonBox->setGeometry( rect.x(), rect.bottom(), rect.width(), h );
diff --git a/src/inputpanel/QskInputContext.cpp b/src/inputpanel/QskInputContext.cpp
index c5a016b1..898437e2 100644
--- a/src/inputpanel/QskInputContext.cpp
+++ b/src/inputpanel/QskInputContext.cpp
@@ -408,7 +408,7 @@ void QskInputContext::showPanel( const QQuickItem* item )
 
         auto window = m_data->createWindow( panel );
 
-        QSize size = window->effectivePreferredSize();
+        QSize size = window->sizeConstraint();
         if ( size.isEmpty() )
         {
             // no idea, may be something based on the screen size