[PATCH] Fix for fdo39748, part II

[Olivier Hallot]

Code clenup
Improvement on extension list box size calculation
---
 desktop/source/deployment/gui/dp_gui.hrc         |    1 -
 desktop/source/deployment/gui/dp_gui_dialog2.cxx |   12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index 0419e63..744cd21 100644
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -48,7 +48,6 @@
 #define RID_EM_FT_GET_EXTENSIONS               20
 #define RID_EM_FT_PROGRESS                     21
 #define RID_EM_FT_MSG                          22
-#define RID_EM_BTN_SELECT                      23
 
 // local RIDs:
 #define PB_LICENSE_DOWN                         50
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index fe92e19..23430b7 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1221,6 +1221,8 @@ void ExtMgrDialog::Resize()
     aDivSize.Width() = aTotalSize.Width() - aFTTypeOfExtSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - RSC_SP_DLG_INNERBORDER_RIGHT;
     m_aDivider2.SetPosSizePixel( aPos , aDivSize );
 
+
+
     aPos.X() = aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_RIGHT - aBtnSize.Width();
     m_aCancelBtn.SetPosPixel( Point( aPos.X(), aPos.Y() - ((aBtnSize.Height()-aFTSize.Height())/2) ) );
 
@@ -1256,12 +1258,11 @@ void ExtMgrDialog::Resize()
     m_aProgressText.SetPosSizePixel( aPos, aFTSize );
 
     Size aSize( aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - RSC_SP_DLG_INNERBORDER_RIGHT,
-                aTotalSize.Height() - 3.3*aBtnSize.Height() - LINE_SIZE -
-                RSC_SP_DLG_INNERBORDER_TOP - 3*RSC_SP_DLG_INNERBORDER_BOTTOM );
-
-    m_pExtensionBox->SetSizePixel( aSize );
-
+                aTotalSize.Height() - aBtnSize.Height() - LINE_SIZE - aFTSize.Height()
+                - aCBSize.Height() - aFTTypeOfExtSize.Height()
+                - RSC_SP_DLG_INNERBORDER_TOP - 5*RSC_SP_DLG_INNERBORDER_BOTTOM );
 
+    m_pExtensionBox->SetSizePixel(aSize );
 
 }
 //------------------------------------------------------------------------------
@@ -1653,7 +1654,6 @@ void UpdateRequiredDialog::Resize()
     Size aDivSize( aTotalSize.Width(), LINE_SIZE );
     aPos = Point( 0, aPos.Y() - LINE_SIZE - RSC_SP_DLG_INNERBORDER_BOTTOM );
     m_aDivider.SetPosSizePixel( aPos, aDivSize );
-    aPos = Point( 0, 5 );
 
     // Calc fixed text size
     aPos = Point( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP );
-- 
1.7.5.4


--------------030003000407050908020804--