Kaydet (Commit) 9b6a6705 authored tarafından Caolán McNamara's avatar Caolán McNamara

if it makes sense to handle DataChanged, then the same init must be called

as in the ctor

Change-Id: Ib95768397dc99d09154af03846f001d647437b69
üst cd962f12
...@@ -192,6 +192,8 @@ private: ...@@ -192,6 +192,8 @@ private:
} }
DECL_DLLPRIVATE_LINK( CheckAndMarkUnknownFont, VclWindowEvent* ); DECL_DLLPRIVATE_LINK( CheckAndMarkUnknownFont, VclWindowEvent* );
void SetOptimalSize();
protected: protected:
virtual void Select() SAL_OVERRIDE; virtual void Select() SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
...@@ -909,10 +911,7 @@ SvxFontNameBox_Impl::SvxFontNameBox_Impl( vcl::Window* pParent, const Reference< ...@@ -909,10 +911,7 @@ SvxFontNameBox_Impl::SvxFontNameBox_Impl( vcl::Window* pParent, const Reference<
m_xFrame (_xFrame), m_xFrame (_xFrame),
mbEndPreview(false) mbEndPreview(false)
{ {
Size aSize(LogicToPixel(aLogicalSize, MAP_APPFONT)); SetOptimalSize();
set_width_request(aSize.Width());
set_height_request(aSize.Height());
SetSizePixel(aSize);
EnableControls_Impl(); EnableControls_Impl();
GetSubEdit()->AddEventListener( LINK( this, SvxFontNameBox_Impl, CheckAndMarkUnknownFont )); GetSubEdit()->AddEventListener( LINK( this, SvxFontNameBox_Impl, CheckAndMarkUnknownFont ));
} }
...@@ -1031,12 +1030,20 @@ bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) ...@@ -1031,12 +1030,20 @@ bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt )
return nHandled || FontNameBox::Notify( rNEvt ); return nHandled || FontNameBox::Notify( rNEvt );
} }
void SvxFontNameBox_Impl::SetOptimalSize()
{
Size aSize(LogicToPixel(aLogicalSize, MAP_APPFONT));
set_width_request(aSize.Width());
set_height_request(aSize.Height());
SetSizePixel(aSize);
}
void SvxFontNameBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) void SvxFontNameBox_Impl::DataChanged( const DataChangedEvent& rDCEvt )
{ {
if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{ {
SetSizePixel(LogicToPixel(aLogicalSize, MAP_APPFONT)); SetOptimalSize();
} }
else if ( ( rDCEvt.GetType() == DataChangedEventType::FONTS ) || else if ( ( rDCEvt.GetType() == DataChangedEventType::FONTS ) ||
( rDCEvt.GetType() == DataChangedEventType::DISPLAY ) ) ( rDCEvt.GetType() == DataChangedEventType::DISPLAY ) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment