diff options
| -rw-r--r-- | icon-themes/galaxy/svx/res/symphony/Line_color.png | bin | 3481 -> 3057 bytes | |||
| -rw-r--r-- | icon-themes/galaxy/svx/res/symphony/fill_color.png | bin | 3517 -> 3240 bytes | |||
| -rw-r--r-- | icon-themes/galaxy/svx/res/symphony/sc_backgroundcolor.png | bin | 3625 -> 3240 bytes | |||
| -rw-r--r-- | icon-themes/galaxy/svx/res/symphony/sch_backgroundcolor.png | bin | 3410 -> 3042 bytes | |||
| -rw-r--r-- | svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 3 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbxcolorupdate.cxx | 31 |
6 files changed, 5 insertions, 29 deletions
diff --git a/icon-themes/galaxy/svx/res/symphony/Line_color.png b/icon-themes/galaxy/svx/res/symphony/Line_color.png Binary files differindex a9522b9eeedd..0e57320662ae 100644 --- a/icon-themes/galaxy/svx/res/symphony/Line_color.png +++ b/icon-themes/galaxy/svx/res/symphony/Line_color.png diff --git a/icon-themes/galaxy/svx/res/symphony/fill_color.png b/icon-themes/galaxy/svx/res/symphony/fill_color.png Binary files differindex 1d8837545728..7c44c6e08e1c 100644 --- a/icon-themes/galaxy/svx/res/symphony/fill_color.png +++ b/icon-themes/galaxy/svx/res/symphony/fill_color.png diff --git a/icon-themes/galaxy/svx/res/symphony/sc_backgroundcolor.png b/icon-themes/galaxy/svx/res/symphony/sc_backgroundcolor.png Binary files differindex 7f926b66bd71..7c44c6e08e1c 100644 --- a/icon-themes/galaxy/svx/res/symphony/sc_backgroundcolor.png +++ b/icon-themes/galaxy/svx/res/symphony/sc_backgroundcolor.png diff --git a/icon-themes/galaxy/svx/res/symphony/sch_backgroundcolor.png b/icon-themes/galaxy/svx/res/symphony/sch_backgroundcolor.png Binary files differindex a2e234fc3311..20e5081aeae8 100644 --- a/icon-themes/galaxy/svx/res/symphony/sch_backgroundcolor.png +++ b/icon-themes/galaxy/svx/res/symphony/sch_backgroundcolor.png diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 2457bcfc967a..dbb63b1c9608 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -345,9 +345,8 @@ void ParaPropertyPanel::InitToolBoxBGColor() { const sal_uInt16 nIdBackColor = mpTBxBackColor->GetItemId(UNO_PARABACKCOLOR); - mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(SID_BACKGROUND_COLOR, nIdBackColor, mpTBxBackColor)); - mpTBxBackColor->SetItemImage(nIdBackColor, GetDisplayBackground().GetColor().IsDark()? maImgBackColorHigh : maImgBackColor); + mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(SID_BACKGROUND_COLOR, nIdBackColor, mpTBxBackColor)); mpTBxBackColor->SetItemBits( nIdBackColor, mpTBxBackColor->GetItemBits( nIdBackColor ) | TIB_DROPDOWNONLY ); Link aLink = LINK(this, ParaPropertyPanel, ToolBoxBackColorDDHandler); diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index 53376bf1d692..fc441874341f 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -126,7 +126,7 @@ namespace svx mbWasHiContrastMode = mpTbx->GetSettings().GetStyleSettings().GetHighContrastMode(); - if( COL_TRANSPARENT != aColor.GetColor() ) + if( ( COL_TRANSPARENT != aColor.GetColor() ) && ( maBmpSize.Width() == maBmpSize.Height() ) ) pBmpAcc->SetLineColor( aColor ); else if( mpTbx->GetBackground().GetColor().IsDark() ) pBmpAcc->SetLineColor( Color( COL_WHITE ) ); @@ -135,33 +135,10 @@ namespace svx pBmpAcc->SetFillColor( maCurColor = aColor ); - if( maBmpSize.Width() <= 16 ) - maUpdRect = Rectangle( Point( 0,12 ), Size( maBmpSize.Width(), 4 ) ); - else if(76 == maBmpSize.Width() && 12 == maBmpSize.Height()) - { - maUpdRect.Left() = 22; - maUpdRect.Top() = 2; - maUpdRect.Right() = 73; - maUpdRect.Bottom() = 9; - } - else if(maBmpSize.Width() >= (2 * maBmpSize.Height() - 2) && maBmpSize.Height() >= 16) - { - maUpdRect.Left() = maBmpSize.Height() + 2; - maUpdRect.Top() = 2; - maUpdRect.Right() = maBmpSize.Width() - 3; - maUpdRect.Bottom() = maBmpSize.Height() - 3; - } + if( maBmpSize.Width() == maBmpSize.Height() ) + maUpdRect = Rectangle( Point( 0, maBmpSize.Height() * 3 / 4 ), Size( maBmpSize.Width(), maBmpSize.Height() / 4 ) ); else - { - maUpdRect = Rectangle( Point( 0, 0 ), Size( maBmpSize.Width(), maBmpSize.Height() ) ); - - // Now, fit the selected color inside the toolbox color-rectangle such that - // the distinct boundaries of the rectangle of toolbox are also clearly visible. - maUpdRect.Left() += 21; - maUpdRect.Top() += 1; - maUpdRect.Bottom() -= 1; - maUpdRect.Right() -= 4; - } + maUpdRect = Rectangle( Point( maBmpSize.Height() + 2, 2 ), Point( maBmpSize.Width() - 3, maBmpSize.Height() - 3 ) ); pBmpAcc->DrawRect( maUpdRect ); |
