diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2014-10-28 22:24:23 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2014-10-28 22:46:37 +0200 |
| commit | 3efc3cc5b0b4b6151e928c2348c7dc6f74181db5 (patch) | |
| tree | a857cd404c24577593e2949f4cb87f6500e882b7 | |
| parent | 7ff283c6b3dad49129cd0df9176275805d25d7b9 (diff) | |
colorwindow: try to fix initial layout
Change-Id: Ic69bbcd877d248afd0f23a867d4c57d801479b74
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 23 | ||||
| -rw-r--r-- | svx/uiconfig/ui/colorwindow.ui | 2 |
2 files changed, 13 insertions, 12 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 9ca375a54116..f42b853dff65 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1148,10 +1148,6 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, mpColorSet->SetStyle( WinBits(WB_FLATVALUESET | WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT) ); mpRecentColorSet->SetStyle( WinBits(WB_FLATVALUESET | WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT) ); - mpColorSet->layoutAllVisible(mrPaletteManager.GetColorCount()); - mpRecentColorSet->SetLineCount( 1 ); - mpRecentColorSet->layoutAllVisible(mrPaletteManager.GetRecentColorCount()); - if ( SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR == theSlotId ) { mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) ); @@ -1211,7 +1207,14 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, SetText( rWndTitle ); mrPaletteManager.ReloadColorSet(*mpColorSet); + mpColorSet->layoutToGivenHeight(mpColorSet->GetSizePixel().Height(), mrPaletteManager.GetColorCount()); + mrPaletteManager.ReloadRecentColorSet(*mpRecentColorSet); + mpRecentColorSet->SetLineCount( 1 ); + Size aSize = mpRecentColorSet->layoutAllVisible(mrPaletteManager.GetRecentColorCount()); + mpRecentColorSet->set_height_request(aSize.Height()); + mpRecentColorSet->set_width_request(aSize.Width()); + AddStatusListener( ".uno:ColorTableState" ); AddStatusListener( maCommand ); } @@ -1293,8 +1296,6 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, OpenPickerClickHdl) void SvxColorWindow_Impl::Resize() { - mpColorSet->SetSizePixel( this->GetOutputSizePixel() ); - mpRecentColorSet->SetSizePixel( this->GetOutputSizePixel() ); } void SvxColorWindow_Impl::StartSelection() @@ -1313,11 +1314,11 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co { if (( nSID == SID_COLOR_TABLE ) && ( pState->ISA( SvxColorListItem ))) { - mrPaletteManager.ReloadColorSet(*mpColorSet); - mrPaletteManager.ReloadRecentColorSet(*mpRecentColorSet); - - mpColorSet->layoutAllVisible(mrPaletteManager.GetColorCount()); - mpRecentColorSet->layoutAllVisible(mrPaletteManager.GetRecentColorCount()); + if ( mrPaletteManager.GetPalette() == 0 ) + { + mrPaletteManager.ReloadColorSet(*mpColorSet); + mpColorSet->layoutToGivenHeight(mpColorSet->GetSizePixel().Height(), mrPaletteManager.GetColorCount()); + } } else if ( SfxItemState::DEFAULT <= eState ) { diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui index 1c2978e06b11..10553850ab71 100644 --- a/svx/uiconfig/ui/colorwindow.ui +++ b/svx/uiconfig/ui/colorwindow.ui @@ -108,7 +108,7 @@ <property name="receives_default">True</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">7</property> </packing> |