summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorAshod Nakashian <ashod.nakashian@collabora.co.uk>2018-10-27 10:53:43 -0400
committerJan Holesovsky <kendy@collabora.com>2018-11-08 09:14:38 +0100
commita64bb41e2180818187563f92e0134eac459584fe (patch)
treef4570ef2c2017f5bc3f5a0a0f07414e560956ec1 /vcl
parentc8ae3b1e9806cee83466087df989fc05d0c448f2 (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')
-rw-r--r--vcl/headless/svpframe.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 835b77f39add..e9770392127f 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -437,13 +437,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()