[Libreoffice-commits] core.git: Branch 'feature/gsoc14-colors' - svx/source

[Krisztian Pinter]

 svx/source/tbxctrls/tbcontrl.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d1f87b779d5962455cac81622113a6480e4ef752
Author: Krisztian Pinter <pin.terminator at gmail.com>
Date:   Tue Aug 5 17:21:08 2014 +0200

    Make small UI tweaks to SvxColorWindow_Impl
    
    Change-Id: I604cbf8ca6f7ebb14c1c95e62f997c3150370119

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 7fc11de..446fb1e 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1035,6 +1035,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
     get(mpColorSet,         "colorset");
 
     mpColorSet->SetStyle( WinBits(WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT) );
+    mpColorSet->SetEdgeBlending( false );
     if ( SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR == theSlotId )
     {
         mpColorSet->SetStyle( mpColorSet->GetStyle() | WB_NONEFIELD );
@@ -1149,6 +1150,7 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, OpenPickerClickHdl)
 
 void SvxColorWindow_Impl::Resize()
 {
+    mpColorSet->SetSizePixel( this->GetOutputSizePixel() );
     SetOutputSizePixel(maWindowSize);
 }