diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-10 12:29:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-11 07:01:14 +0100 |
| commit | 2fab2c9d494035cc55d0bc56a47e784be6e64510 (patch) | |
| tree | 719f64e6f10d9649717cac591dbed52a6020889f /vcl/unx/generic/window/salframe.cxx | |
| parent | 71a61ab2d8b650ebe0655cebd7233959a5a3811e (diff) | |
loplugin:indentation in vcl
Change-Id: Idd7166833764fdf1d9c42a050490572a8b330199
Reviewed-on: https://gerrit.libreoffice.org/67610
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/unx/generic/window/salframe.cxx')
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index f4a24cfe6458..59e5370736f1 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -1879,10 +1879,10 @@ void X11SalFrame::SetSize( const Size &rSize ) { if( rSize.Width() > 0 && rSize.Height() > 0 ) { - if( ! ( nStyle_ & SalFrameStyleFlags::SIZEABLE ) + if( ! ( nStyle_ & SalFrameStyleFlags::SIZEABLE ) && ! IsChildWindow() && ( nStyle_ & (SalFrameStyleFlags::FLOAT|SalFrameStyleFlags::OWNERDRAWDECORATION) ) != SalFrameStyleFlags::FLOAT ) - { + { XSizeHints* pHints = XAllocSizeHints(); long nSupplied = 0; XGetWMNormalHints( GetXDisplay(), @@ -1899,7 +1899,7 @@ void X11SalFrame::SetSize( const Size &rSize ) GetShellWindow(), pHints ); XFree( pHints ); - } + } XResizeWindow( GetXDisplay(), IsSysChildWindow() ? GetWindow() : GetShellWindow(), rSize.Width(), rSize.Height() ); if( GetWindow() != GetShellWindow() ) { @@ -1929,20 +1929,20 @@ void X11SalFrame::SetPosSize( const tools::Rectangle &rPosSize ) if( !values.width || !values.height ) return; - if( mpParent && ! IsSysChildWindow() ) - { + if( mpParent && ! IsSysChildWindow() ) + { if( AllSettings::GetLayoutRTL() ) values.x = mpParent->maGeometry.nWidth-values.width-1-values.x; - ::Window aChild; - // coordinates are relative to parent, so translate to root coordinates - XTranslateCoordinates( GetDisplay()->GetDisplay(), + ::Window aChild; + // coordinates are relative to parent, so translate to root coordinates + XTranslateCoordinates( GetDisplay()->GetDisplay(), mpParent->GetWindow(), GetDisplay()->GetRootWindow( m_nXScreen ), values.x, values.y, &values.x, &values.y, & aChild ); - } + } bool bMoved = false; bool bSized = false; @@ -2351,7 +2351,7 @@ void X11SalFrame::SetInputContext( SalInputContext* pContext ) mpInputContext.reset( new SalI18N_InputContext( this ) ); if (mpInputContext->UseContext()) { - mpInputContext->ExtendEventMask( GetShellWindow() ); + mpInputContext->ExtendEventMask( GetShellWindow() ); if (mbInputFocus) mpInputContext->SetICFocus( this ); } @@ -3247,7 +3247,7 @@ bool X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent ) else if (nLen > 0 /* nEncoding == RTL_TEXTENCODING_UNICODE */) { pString = reinterpret_cast<sal_Unicode*>(pPrintable); - nSize = nLen; + nSize = nLen; } else { |