diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/menubarwindow.cxx | 5 | ||||
| -rw-r--r-- | vcl/source/window/menufloatingwindow.cxx | 5 |
2 files changed, 10 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(); } diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index a4b70b4a8234..cd92d11f5be4 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -46,6 +46,7 @@ MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, vcl::Window* pParent, WinBit bKeyInput = false; EnableSaveBackground(); + ApplySettings(*this); SetPopupModeEndHdl( LINK( this, MenuFloatingWindow, PopupEnd ) ); @@ -120,6 +121,8 @@ void MenuFloatingWindow::Resize() void MenuFloatingWindow::ApplySettings(vcl::RenderContext& rRenderContext) { + FloatingWindow::ApplySettings(rRenderContext); + const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); SetPointFont(rRenderContext, rStyleSettings.GetMenuFont()); @@ -1214,6 +1217,7 @@ void MenuFloatingWindow::StateChanged( StateChangedType nType ) if ( ( nType == StateChangedType::ControlForeground ) || ( nType == StateChangedType::ControlBackground ) ) { + ApplySettings(*this); Invalidate(); } } @@ -1227,6 +1231,7 @@ void MenuFloatingWindow::DataChanged( const DataChangedEvent& rDCEvt ) ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { + ApplySettings(*this); Invalidate(); } } |