diff options
| author | Noel <noel.grandin@collabora.co.uk> | 2021-01-11 08:54:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-01-12 17:38:53 +0100 |
| commit | d765ec2295d12ccde1fb25aa92c5d821de748add (patch) | |
| tree | c2f806389478df23b78319c6043971f92995851c /cui | |
| parent | a1d6701105456248f6ff39766a6699f26a8f3d60 (diff) | |
transparency->alpha in tools::Color
this just changes the Get/Set methods, the constructor and internal
representation of Color is not changed.
Change-Id: Idb6e07cc08bbaa5bd55b6bd4b585e648aef507b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109074
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/chardlg.cxx | 6 | ||||
| -rw-r--r-- | cui/source/tabpages/tpcolor.cxx | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 5751a9e8064f..a7e3dda42bc9 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1545,13 +1545,13 @@ void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet ) Color aRGBColor = aColor; if (aRGBColor.IsTransparent() && aColor != COL_AUTO) { - aRGBColor.SetTransparency(0); + aRGBColor.SetAlpha(255); } m_xFontColorLB->SelectEntry(aRGBColor); if (m_xFontTransparencyMtr->get_visible() && aColor != COL_AUTO) { - double fTransparency = aColor.GetTransparency() * 100.0 / 255; + double fTransparency = (255 - aColor.GetAlpha()) * 100.0 / 255; m_xFontTransparencyMtr->set_value(basegfx::fround(fTransparency), FieldUnit::PERCENT); } @@ -1580,7 +1580,7 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet ) { double fTransparency = m_xFontTransparencyMtr->get_value(FieldUnit::PERCENT) * 255.0 / 100; - aSelectedColor.SetTransparency(static_cast<sal_uInt8>(basegfx::fround(fTransparency))); + aSelectedColor.SetAlpha(255 - static_cast<sal_uInt8>(basegfx::fround(fTransparency))); } if (m_bOrigFontColor) diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 6eac86883c99..1956d0c8f86a 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -508,8 +508,8 @@ void SvxColorTabPage::ConvertColorValues (Color& rColor, ColorModel eModell) { case ColorModel::RGB: { - CmykToRgb_Impl (rColor, static_cast<sal_uInt16>(rColor.GetTransparency()) ); - rColor.SetTransparency (sal_uInt8(0)); + CmykToRgb_Impl (rColor, static_cast<sal_uInt16>(255 - rColor.GetAlpha()) ); + rColor.SetAlpha (255); } break; @@ -517,7 +517,7 @@ void SvxColorTabPage::ConvertColorValues (Color& rColor, ColorModel eModell) { sal_uInt16 nK; RgbToCmyk_Impl (rColor, nK ); - rColor.SetTransparency (static_cast<sal_uInt8>(nK)); + rColor.SetAlpha (255 - static_cast<sal_uInt8>(nK)); } break; } @@ -586,7 +586,7 @@ void SvxColorTabPage::UpdateColorValues( bool bUpdatePreset ) m_xCcustom->set_value( ColorToPercent_Impl( aCurrentColor.GetRed() ), FieldUnit::PERCENT ); m_xMcustom->set_value( ColorToPercent_Impl( aCurrentColor.GetBlue() ), FieldUnit::PERCENT ); m_xYcustom->set_value( ColorToPercent_Impl( aCurrentColor.GetGreen() ), FieldUnit::PERCENT ); - m_xKcustom->set_value( ColorToPercent_Impl( aCurrentColor.GetTransparency() ), FieldUnit::PERCENT ); + m_xKcustom->set_value( ColorToPercent_Impl( 255 - aCurrentColor.GetAlpha() ), FieldUnit::PERCENT ); if( bUpdatePreset ) { @@ -596,7 +596,7 @@ void SvxColorTabPage::UpdateColorValues( bool bUpdatePreset ) Application::GetSettings().GetUILanguageTag())); m_xYpreset->set_text(unicode::formatPercent(ColorToPercent_Impl(aPreviousColor.GetGreen()), Application::GetSettings().GetUILanguageTag())); - m_xKpreset->set_text(unicode::formatPercent(ColorToPercent_Impl(aPreviousColor.GetTransparency()), + m_xKpreset->set_text(unicode::formatPercent(ColorToPercent_Impl(255 - aPreviousColor.GetAlpha()), Application::GetSettings().GetUILanguageTag())); } |