diff options
| author | Olivier Hallot <olivier.hallot@alta.org.br> | 2011-11-28 22:35:31 -0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-11-29 10:23:01 +0000 |
| commit | ecbf39171991069d794133797e5f8714c3d7d7f9 (patch) | |
| tree | f01897704260ecaf3b261bcb59b19d93d47f8d11 /desktop | |
| parent | a43caa76d9da112f40a973911e779fc42c5af3c3 (diff) | |
Fix for fdo39748, part II
Code clenup
Improvement on extension list box size calculation
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui.hrc | 1 | ||||
| -rw-r--r-- | 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 0419e636f237..744cd210a56f 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 fe92e1967bca..23430b76a0c2 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 ); |