diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2023-08-16 17:57:33 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2023-08-18 06:04:29 +0200 |
| commit | c192c46d3f2be5e48783d590313f875e1f0477a1 (patch) | |
| tree | 18a7bd4b7f5b5b311dc888b3818aa0d4dbb3c7a0 | |
| parent | 8b9643960117612b7e1cae1ed8325c2630232d0f (diff) | |
vcl: Deduplicate 2 common lines for border win frames
These 2 members are set the same way for all of the
3 branches.
Change-Id: I2acbb519e30926eb5798bb52e1ef95dceca47b5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155796
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
| -rw-r--r-- | vcl/source/window/brdwin.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index f0d8e3bed83f..e7b569364021 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1519,22 +1519,19 @@ void ImplBorderWindow::ImplInit( vcl::Window* pParent, mbSmallOutBorder = false; if ( nTypeStyle & BorderWindowStyle::Frame ) { + mpWindowImpl->mbOverlapWin = true; + mpWindowImpl->mbFrame = true; + if( nStyle & WB_SYSTEMCHILDWINDOW ) { - mpWindowImpl->mbOverlapWin = true; - mpWindowImpl->mbFrame = true; mbFrameBorder = false; } else if( nStyle & (WB_OWNERDRAWDECORATION | WB_POPUP) ) { - mpWindowImpl->mbOverlapWin = true; - mpWindowImpl->mbFrame = true; mbFrameBorder = (nOrgStyle & WB_NOBORDER) == 0; } else { - mpWindowImpl->mbOverlapWin = true; - mpWindowImpl->mbFrame = true; mbFrameBorder = false; // closeable windows may have a border as well, eg. system floating windows without caption if ( (nOrgStyle & (WB_BORDER | WB_NOBORDER | WB_MOVEABLE | WB_SIZEABLE/* | WB_CLOSEABLE*/)) == WB_BORDER ) |