diff options
| author | Heiko Tietze <tietze.heiko@gmail.com> | 2024-03-22 12:58:07 +0100 |
|---|---|---|
| committer | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2024-03-23 08:02:18 +0100 |
| commit | d7fd378b533c42f51d1d363f5da30b1fa1281f67 (patch) | |
| tree | b56cd804cb5e99321945378523d9b0860ef46a45 /vcl/unx | |
| parent | e83f7b7c84d5345879c5543b78ce6ad2b32dc2bc (diff) | |
Harmonization of warning and error colors
* hard-coded colors from infobar moved to settings
* weld::LabelType::Warning and ::Error uses these colors
* gtk3 native configuration removed
Change-Id: Ia80584e9267b8385f7f6b25322f5a85a2570af68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165161
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk3/gtkinst.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk3/salnativewidgets-gtk.cxx | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index d0fb7fe0df99..7e0fa2fa5612 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -17925,9 +17925,11 @@ public: break; case weld::LabelType::Warning: set_text_background_color(Application::GetSettings().GetStyleSettings().GetWarningColor()); + set_text_foreground_color(Application::GetSettings().GetStyleSettings().GetWarningTextColor(), false); break; case weld::LabelType::Error: - set_text_background_color(Application::GetSettings().GetStyleSettings().GetHighlightColor()); + set_text_background_color(Application::GetSettings().GetStyleSettings().GetErrorColor()); + set_text_foreground_color(Application::GetSettings().GetStyleSettings().GetErrorTextColor(), false); break; case weld::LabelType::Title: set_text_foreground_color(Application::GetSettings().GetStyleSettings().GetLightColor(), true); diff --git a/vcl/unx/gtk3/salnativewidgets-gtk.cxx b/vcl/unx/gtk3/salnativewidgets-gtk.cxx index bf9e4872a6a9..a4e8a82aed28 100644 --- a/vcl/unx/gtk3/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/salnativewidgets-gtk.cxx @@ -2435,11 +2435,6 @@ bool GtkSalGraphics::updateSettings(AllSettings& rSettings) aStyleSet.SetActiveColor( aHighlightColor ); aStyleSet.SetActiveTextColor( aHighlightTextColor ); - // warning color - GdkRGBA warning_color; - if (gtk_style_context_lookup_color(pCStyle, "warning_color", &warning_color)) - aStyleSet.SetWarningColor(getColor(warning_color)); - // field background color style_context_set_state(pCStyle, GTK_STATE_FLAG_NORMAL); ::Color aBackFieldColor = style_context_get_background_color(pCStyle); |