Kaydet (Commit) dee7b262 authored tarafından Ashod Nakashian's avatar Ashod Nakashian Kaydeden (comit) Jan Holesovsky

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
üst 93ffc5cd
...@@ -439,13 +439,14 @@ void SvpSalFrame::UpdateSettings( AllSettings& rSettings ) ...@@ -439,13 +439,14 @@ void SvpSalFrame::UpdateSettings( AllSettings& rSettings )
} }
bFreeGraphics = true; bFreeGraphics = true;
} }
rSettings.SetStyleSettings(aStyleSettings);
pGraphics->updateSettings(rSettings); pGraphics->updateSettings(rSettings);
if (bFreeGraphics) if (bFreeGraphics)
ReleaseGraphics(pGraphics); ReleaseGraphics(pGraphics);
} }
else
rSettings.SetStyleSettings( aStyleSettings ); rSettings.SetStyleSettings(aStyleSettings);
} }
void SvpSalFrame::Beep() void SvpSalFrame::Beep()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment