diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-05-29 16:56:15 +0900 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-05-29 16:58:19 +0900 |
commit | 9ce71b67f705ccbc6df327d1bb181ca20b3ed17f (patch) | |
tree | 741b26fa1674f1cddf807f335963295505bfcc72 /vcl/source/window/menubarwindow.cxx | |
parent | b0922150c2b3a63b810af5adda2770f270185a61 (diff) |
menu: call ApplySettings on places that InitSettings was called
Change-Id: I5519cf6a8e77a7da27fa883f2f7695ae4371af88
Diffstat (limited to 'vcl/source/window/menubarwindow.cxx')
-rw-r--r-- | vcl/source/window/menubarwindow.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index 1f690fc7d8d3..3a5d8fb7f706 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -990,6 +990,7 @@ void MenuBarWindow::StateChanged( StateChangedType nType ) if (nType == StateChangedType::ControlForeground || nType == StateChangedType::ControlBackground) { + ApplySettings(*this); Invalidate(); } else if(pMenu) @@ -1003,6 +1004,8 @@ void MenuBarWindow::LayoutChanged() if (!pMenu) return; + ApplySettings(*this); + // if the font was changed. long nHeight = pMenu->ImplCalcSize(this).Height(); @@ -1023,6 +1026,7 @@ void MenuBarWindow::LayoutChanged() void MenuBarWindow::ApplySettings(vcl::RenderContext& rRenderContext) { + Window::ApplySettings(rRenderContext); const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); SetPointFont(rRenderContext, rStyleSettings.GetMenuFont()); @@ -1083,6 +1087,7 @@ void MenuBarWindow::DataChanged( const DataChangedEvent& rDCEvt ) ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { + ApplySettings(*this); ImplInitStyleSettings(); LayoutChanged(); } |