diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-10-27 10:53:43 -0400 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-11-09 18:42:32 +0100 |
| commit | dee7b2621a47c2f681c044f5ef771df0a02779a7 (patch) | |
| tree | 48e25fe708ef16ee3977910e44db0d1d42783789 /vcl/headless/svpframe.cxx | |
| parent | 93ffc5cd079dda8eb77f625aa7119f9d6b614fab (diff) | |
LOK: custom widgets: don't clobber the custom colors
The old logic threw away the result of updateSettings
by applying the styles saved and modified after calling
it, which lost all the custom colors thereby breaking
custom-widgets and themeing altogether.
Change-Id: Ic3750f145b67cd6a379f3b628a10c213a31656e7
Diffstat (limited to 'vcl/headless/svpframe.cxx')
| -rw-r--r-- | vcl/headless/svpframe.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index 4958b9d9421d..f159a0cd6f86 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -439,13 +439,14 @@ void SvpSalFrame::UpdateSettings( AllSettings& rSettings ) } bFreeGraphics = true; } + rSettings.SetStyleSettings(aStyleSettings); pGraphics->updateSettings(rSettings); if (bFreeGraphics) ReleaseGraphics(pGraphics); } - - rSettings.SetStyleSettings( aStyleSettings ); + else + rSettings.SetStyleSettings(aStyleSettings); } void SvpSalFrame::Beep() |