Kaydet (Commit) 1d486599 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky Kaydeden (comit) Caolán McNamara

fdo#71748 Fix also for hicontrast and sifr themes

A follow-up of commit e239f372.
Didn't notice there is fill_color.png also in these themes.

Also fixed the ugly yellow color flash of paragraph color picker while
initializing the sidebar (introduced by the above commit). This color
picker shows the actual color of a paragraph, so there is no reason to
set some default color there.

Change-Id: I17eed733d1e35ec71c482e3df906523733383e96
Reviewed-on: https://gerrit.libreoffice.org/7035Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst c5602cfb
...@@ -346,7 +346,7 @@ void ParaPropertyPanel::InitToolBoxBGColor() ...@@ -346,7 +346,7 @@ void ParaPropertyPanel::InitToolBoxBGColor()
const sal_uInt16 nIdBackColor = mpTBxBackColor->GetItemId(UNO_PARABACKCOLOR); const sal_uInt16 nIdBackColor = mpTBxBackColor->GetItemId(UNO_PARABACKCOLOR);
mpTBxBackColor->SetItemImage(nIdBackColor, GetDisplayBackground().GetColor().IsDark()? maImgBackColorHigh : maImgBackColor); mpTBxBackColor->SetItemImage(nIdBackColor, GetDisplayBackground().GetColor().IsDark()? maImgBackColorHigh : maImgBackColor);
mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(SID_BACKGROUND_COLOR, nIdBackColor, mpTBxBackColor)); mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(0 /* not defined, default is transparent */, nIdBackColor, mpTBxBackColor));
mpTBxBackColor->SetItemBits( nIdBackColor, mpTBxBackColor->GetItemBits( nIdBackColor ) | TIB_DROPDOWNONLY ); mpTBxBackColor->SetItemBits( nIdBackColor, mpTBxBackColor->GetItemBits( nIdBackColor ) | TIB_DROPDOWNONLY );
Link aLink = LINK(this, ParaPropertyPanel, ToolBoxBackColorDDHandler); Link aLink = LINK(this, ParaPropertyPanel, ToolBoxBackColorDDHandler);
......
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