diff options
| author | Sahil Gautam <sahil@libreoffice.org> | 2024-08-30 03:26:59 +0530 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2024-08-30 08:30:43 +0200 |
| commit | 083651ef9c6492359380248c958908d9aa490e89 (patch) | |
| tree | be8e143430affffb5c565324277e08db831349c9 /sc | |
| parent | 1ecde0f5d1384946c3e684846e681121b3001219 (diff) | |
Use the correct color for Formula Bar in calc.
Mainly affects QT based VCL_PLUGINS. before https://gerrit.libreoffice.org/c/core/+/171916/14
patch, WindowColor actually the Base color from QPalette. Changing it to
the actual window color, the calc's formula bar became indistinguishable. from
the window So this patch sets the Formula Bar's color to FieldColor, which is same as
the BaseColor from the QPalette.
This also makes the color used on macOS consistent with Edit and VclMultiLineEdit.
Change-Id: I94dcfc67de942314b67126e984b40bb5073e1bd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172617
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/app/inputwin.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index f9d638cddd39..00491fd0e798 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -900,7 +900,7 @@ void ScInputBarGroup::SetBackgrounds() SetBackground(rStyleSettings.GetFaceColor()); // match to bg used in ScTextWnd::SetDrawingArea to the margin area is drawn with the // same desired bg - mxBackground->set_background(rStyleSettings.GetWindowColor()); + mxBackground->set_background(rStyleSettings.GetFieldColor()); } void ScInputBarGroup::DataChanged(const DataChangedEvent& rDCEvt) @@ -1314,7 +1314,7 @@ IMPL_LINK_NOARG(ScTextWndGroup, Impl_ScrollHdl, weld::ScrolledWindow&, void) void ScTextWnd::Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - Color aBgColor = rStyleSettings.GetWindowColor(); + Color aBgColor = rStyleSettings.GetFieldColor(); rRenderContext.SetBackground(aBgColor); // tdf#137713 we rely on GetEditView creating it if it doesn't already exist so @@ -1593,7 +1593,7 @@ void ScTextWnd::InitEditEngine() m_xEditView->SetInsertMode(bIsInsertMode); const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - Color aBgColor = rStyleSettings.GetWindowColor(); + Color aBgColor = rStyleSettings.GetFieldColor(); m_xEditView->SetBackgroundColor(aBgColor); if (pAcc) @@ -2129,7 +2129,7 @@ void ScTextWnd::MakeDialogEditView() m_xEditView->setEditViewCallbacks(this); const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - Color aBgColor = rStyleSettings.GetWindowColor(); + Color aBgColor = rStyleSettings.GetFieldColor(); m_xEditView->SetBackgroundColor(aBgColor); if (pAcc) @@ -2158,7 +2158,7 @@ void ScTextWnd::ImplInitSettings() const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - Color aBgColor= rStyleSettings.GetWindowColor(); + Color aBgColor= rStyleSettings.GetFieldColor(); Color aTxtColor= rStyleSettings.GetWindowTextColor(); aTextFont.SetFillColor ( aBgColor ); @@ -2198,7 +2198,7 @@ void ScTextWnd::SetDrawingArea(weld::DrawingArea* pDrawingArea) const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - Color aBgColor = rStyleSettings.GetWindowColor(); + Color aBgColor = rStyleSettings.GetFieldColor(); Color aTxtColor = rStyleSettings.GetWindowTextColor(); aTextFont.SetTransparent(true); |