summaryrefslogtreecommitdiff
path: root/vcl/win
diff options
context:
space:
mode:
authorIvan Timofeev <timofeev.i.s@gmail.com>2012-05-25 20:03:34 +0400
committerIvan Timofeev <timofeev.i.s@gmail.com>2012-05-25 20:14:48 +0400
commit1ed6ca8173c1916b783e52d92296efdda3c82968 (patch)
treed824bab24ab12adadf29424d6cc5f0bb28feeeef /vcl/win
parent87ccec22b105fda607f70467a14cf60050e45009 (diff)
gtk: add support for "vertical-padding" menu style property
and fix bug in MenuFloatingWindow::ImplHighlightItem - take this border into account Change-Id: Ieeb5a447ed58f9bb064a8b88aefc5d1b666195f7
Diffstat (limited to 'vcl/win')
-rw-r--r--vcl/win/source/gdi/salnativewidgets-luna.cxx3
-rw-r--r--vcl/win/source/window/salframe.cxx3
2 files changed, 4 insertions, 2 deletions
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index fbe80ca41ddb..6ba04d72a256 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -1510,7 +1510,8 @@ void WinSalGraphics::updateSettingsNative( AllSettings& rSettings )
{
// in aero menuitem highlight text is drawn in the same color as normal
aStyleSettings.SetMenuHighlightTextColor( aStyleSettings.GetMenuTextColor() );
- pSVData->maNWFData.mnMenuFormatExtraBorder = 2;
+ pSVData->maNWFData.mnMenuFormatBorderX = 2;
+ pSVData->maNWFData.mnMenuFormatBorderY = 2;
pSVData->maNWFData.maMenuBarHighlightTextColor = aStyleSettings.GetMenuTextColor();
GetSalData()->mbThemeMenuSupport = TRUE;
}
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 4b08f62352e7..99e4447b1207 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2766,7 +2766,8 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
aStyleSettings.SetMenuHighlightTextColor( aStyleSettings.GetHighlightTextColor() );
ImplSVData* pSVData = ImplGetSVData();
- pSVData->maNWFData.mnMenuFormatExtraBorder = 0;
+ pSVData->maNWFData.mnMenuFormatBorderX = 0;
+ pSVData->maNWFData.mnMenuFormatBorderY = 0;
pSVData->maNWFData.maMenuBarHighlightTextColor = Color( COL_TRANSPARENT );
GetSalData()->mbThemeMenuSupport = FALSE;
aStyleSettings.SetMenuColor( ImplWinColorToSal( GetSysColor( COLOR_MENU ) ) );