diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2018-01-18 00:49:17 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2018-01-18 21:50:36 +0100 |
| commit | c5ecb2990123d666dde0d66ce38dc3b9f03802c4 (patch) | |
| tree | 0e3a95dd3f206addfea5a74b5b7a3bca2f2875f4 /vcl/source/app/settings.cxx | |
| parent | 829b0564959411d0cc64169fe69153a714050c0d (diff) | |
Move toolbars to the border window tearoff mechanism
and remove the one from ImplPopupFloatWin. Implemented using
the FloatWinTitleType::TearOff case, which was unused otherwise.
Change-Id: I82a86e5f5897ce1f2e76a2404bb382cbc007700c
Reviewed-on: https://gerrit.libreoffice.org/48095
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'vcl/source/app/settings.cxx')
| -rw-r--r-- | vcl/source/app/settings.cxx | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 97723e7a21b5..5429c20a400c 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -156,7 +156,6 @@ struct ImplStyleData long mnBorderSize; long mnTitleHeight; long mnFloatTitleHeight; - long mnTearOffTitleHeight; long mnScrollBarSize; long mnSplitSize; long mnSpinSize; @@ -632,7 +631,6 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) : mnBorderSize = rData.mnBorderSize; mnTitleHeight = rData.mnTitleHeight; mnFloatTitleHeight = rData.mnFloatTitleHeight; - mnTearOffTitleHeight = rData.mnTearOffTitleHeight; mnScrollBarSize = rData.mnScrollBarSize; mnMinThumbSize = rData.mnMinThumbSize; mnSplitSize = rData.mnSplitSize; @@ -752,7 +750,6 @@ void ImplStyleData::SetStandardStyles() mnBorderSize = 1; mnTitleHeight = 18; mnFloatTitleHeight = 13; - mnTearOffTitleHeight = 8; mbHighContrast = false; mbUseSystemUIFonts = true; mnUseFlatBorders = false; @@ -1755,12 +1752,6 @@ StyleSettings::GetFloatTitleHeight() const return mxData->mnFloatTitleHeight; } -long -StyleSettings::GetTearOffTitleHeight() const -{ - return mxData->mnTearOffTitleHeight; -} - void StyleSettings::SetScrollBarSize( long nSize ) { @@ -2286,7 +2277,6 @@ bool StyleSettings::operator ==( const StyleSettings& rSet ) const (mxData->mnBorderSize == rSet.mxData->mnBorderSize) && (mxData->mnTitleHeight == rSet.mxData->mnTitleHeight) && (mxData->mnFloatTitleHeight == rSet.mxData->mnFloatTitleHeight) && - (mxData->mnTearOffTitleHeight == rSet.mxData->mnTearOffTitleHeight) && (mxData->mnScrollBarSize == rSet.mxData->mnScrollBarSize) && (mxData->mnMinThumbSize == rSet.mxData->mnMinThumbSize) && (mxData->mnSplitSize == rSet.mxData->mnSplitSize) && |