diff options
author | Jan Holesovsky <kendy@collabora.com> | 2015-10-07 17:37:22 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2015-10-07 18:08:54 +0200 |
commit | e8bcffc787939294b74492527b60fe309490d5e4 (patch) | |
tree | b208958722683842b9973ca6a4eee9ac39a4b983 /svx | |
parent | c8a795c9a0cc542f008166109528d4257afe2851 (diff) |
SvxStyleBox_Impl::CalcOptimalExtraUserWidth() is a (very) expensive operation.
Don't call it ~20 times on startup, instead call it once when the user
actually opens the styles dropdown.
Change-Id: I7bb28d0739bf917d23041f384f60a39a7ed5cbea
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 5a60b1c9ecfb..37148e12bfe3 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -137,9 +137,10 @@ public: void SetDefaultStyle( const OUString& rDefault ) { sDefaultStyle = rDefault; } - void CalcOptimalExtraUserWidth(); - protected: + /// Calculate the optimal width of the dropdown. Very expensive operation, triggers lots of font measurement. + DECL_DLLPRIVATE_LINK_TYPED(CalcOptimalExtraUserWidth, VclWindowEvent&, void); + virtual void Select() SAL_OVERRIDE; private: @@ -337,6 +338,7 @@ SvxStyleBox_Impl::SvxStyleBox_Impl(vcl::Window* pParent, SetOptimalSize(); EnableAutocomplete( true ); EnableUserDraw( true ); + AddEventListener(LINK(this, SvxStyleBox_Impl, CalcOptimalExtraUserWidth)); SetUserItemSize( Size( 0, ITEM_HEIGHT ) ); } @@ -347,10 +349,13 @@ SvxStyleBox_Impl::~SvxStyleBox_Impl() void SvxStyleBox_Impl::dispose() { - for(int i = 0; i < MAX_STYLES_ENTRIES; i++) + RemoveEventListener(LINK(this, SvxStyleBox_Impl, CalcOptimalExtraUserWidth)); + + for (int i = 0; i < MAX_STYLES_ENTRIES; i++) { m_pButtons[i].disposeAndClear(); } + ComboBox::dispose(); } @@ -789,8 +794,12 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) DrawEntry( rUDEvt, false, false ); } -void SvxStyleBox_Impl::CalcOptimalExtraUserWidth() +IMPL_LINK_TYPED(SvxStyleBox_Impl, CalcOptimalExtraUserWidth, VclWindowEvent&, event, void) { + // perform the calculation only when we are opening the dropdown + if (event.GetId() != VCLEVENT_DROPDOWN_PRE_OPEN) + return; + long nMaxNormalFontWidth = 0; sal_Int32 nEntryCount = GetEntryCount(); for (sal_Int32 i = 0; i < nEntryCount; ++i) @@ -2309,8 +2318,6 @@ void SvxStyleToolBoxControl::FillStyleBox() sal_uInt16 nLines = static_cast<sal_uInt16>( std::min( pBox->GetEntryCount(), static_cast<sal_Int32>(MAX_STYLES_ENTRIES))); pBox->SetDropDownLineCount( nLines ); - - pBox->CalcOptimalExtraUserWidth(); } } } |