[Libreoffice-commits] core.git: sc/source svtools/source sw/source vcl/osx vcl/source vcl/unx vcl/win
Tor Lillqvist
tml at collabora.com
Thu May 18 07:08:44 UTC 2017
sc/source/ui/view/hdrcont.cxx | 2 +-
sc/source/ui/view/prevwsh.cxx | 2 +-
svtools/source/control/ruler.cxx | 2 +-
sw/source/uibase/docvw/srcedtw.cxx | 4 ++--
sw/source/uibase/uiview/scroll.cxx | 2 +-
vcl/osx/salframeview.mm | 4 ----
vcl/source/control/edit.cxx | 6 +++---
vcl/source/outdev/font.cxx | 1 -
vcl/source/outdev/outdev.cxx | 2 +-
vcl/source/outdev/textline.cxx | 2 --
vcl/source/window/clipping.cxx | 4 ++--
vcl/source/window/floatwin.cxx | 8 +++-----
vcl/source/window/mouse.cxx | 5 -----
vcl/source/window/paint.cxx | 16 +++++++---------
vcl/source/window/window.cxx | 12 ++++--------
vcl/source/window/window2.cxx | 4 ++--
vcl/source/window/winproc.cxx | 5 ++---
vcl/unx/generic/window/salframe.cxx | 3 ---
vcl/unx/gtk/gtksalframe.cxx | 3 ---
vcl/unx/gtk3/gtk3gtkframe.cxx | 4 +---
vcl/win/window/salframe.cxx | 3 ---
21 files changed, 31 insertions(+), 63 deletions(-)
New commits:
commit d89fa2bd4944625e2dbe56d5709a3f126db24f21
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue May 16 21:48:02 2017 +0300
Clean up a set of RTL-related comments
It is fairly pointless to have a comment like "--- RTL --- (mirror
mouse pos)" in front of code that obviously is related to RTL anyway,
like "if( AllSettings::GetLayoutRTL() )". Also, the fact that many
comment were exactly the same indicates that they has been added as an
in-line version control change marker.
In other places, comments were informational, but no need for them to
include yet another metasyntax, "--- RTL ---". Just "RTL:" works fine.
Change-Id: I20feef308ed8ac9d32a8bf440fc20b442753c4ff
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index e63f539b56fd..de94d101b6b9 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -64,7 +64,7 @@ ScHeaderControl::ScHeaderControl( vcl::Window* pParent, SelectionEngine* pSelect
bInRefMode ( false ),
pTabView ( pTab )
{
- // --- RTL --- no default mirroring for this window, the spreadsheet itself
+ // RTL: no default mirroring for this window, the spreadsheet itself
// is also not mirrored
// mirror the vertical window for correct border drawing
// table layout depends on sheet format, not UI setting, so the
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 06a4d189cf29..37097ed5474e 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -124,7 +124,7 @@ void ScPreviewShell::Construct( vcl::Window* pParent )
pHorScroll = VclPtr<ScrollBar>::Create(pParent, WB_HSCROLL );
pVerScroll = VclPtr<ScrollBar>::Create(pParent, WB_VSCROLL);
- // SSA: --- RTL --- no mirroring for horizontal scrollbars
+ // RTL: no mirroring for horizontal scrollbars
pHorScroll->EnableRTL( false );
pHorScroll->SetEndScrollHdl( LINK( this, ScPreviewShell, ScrollHandler ) );
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 57f0311940bd..a931237f1d31 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -215,7 +215,7 @@ void Ruler::ImplInit( WinBits nWinBits )
{
nWinBits |= WB_HORZ;
- // --- RTL --- no UI mirroring for horizontal rulers, because
+ // RTL: no UI mirroring for horizontal rulers, because
// the document is also not mirrored
EnableRTL( false );
}
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index 6ccfee3d61b1..dde4240f0262 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -507,12 +507,12 @@ void SwSrcEditWindow::CreateTextEngine()
// create Scrollbars
m_pHScrollbar = VclPtr<ScrollBar>::Create(this, WB_3DLOOK |WB_HSCROLL|WB_DRAG);
- m_pHScrollbar->EnableRTL( false ); // --- RTL --- no mirroring for scrollbars
+ m_pHScrollbar->EnableRTL( false );
m_pHScrollbar->SetScrollHdl(LINK(this, SwSrcEditWindow, ScrollHdl));
m_pHScrollbar->Show();
m_pVScrollbar = VclPtr<ScrollBar>::Create(this, WB_3DLOOK |WB_VSCROLL|WB_DRAG);
- m_pVScrollbar->EnableRTL( false ); // --- RTL --- no mirroring for scrollbars
+ m_pVScrollbar->EnableRTL( false );
m_pVScrollbar->SetScrollHdl(LINK(this, SwSrcEditWindow, ScrollHdl));
m_pHScrollbar->EnableDrag();
m_pVScrollbar->Show();
diff --git a/sw/source/uibase/uiview/scroll.cxx b/sw/source/uibase/uiview/scroll.cxx
index e8474e16bab4..70a69d9d1046 100644
--- a/sw/source/uibase/uiview/scroll.cxx
+++ b/sw/source/uibase/uiview/scroll.cxx
@@ -31,7 +31,7 @@ SwScrollbar::SwScrollbar( vcl::Window *pWin, bool bHoriz ) :
bVisible(false),
bSizeSet(false)
{
- // SSA: --- RTL --- no mirroring for horizontal scrollbars
+ // No mirroring for horizontal scrollbars
if( bHoriz )
EnableRTL( false );
}
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 15d5733cd882..50cd5bc4e722 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -638,7 +638,6 @@ private:
aEvent.mnButton = nButton;
aEvent.mnCode = aEvent.mnButton | nModMask;
- // --- RTL --- (mirror mouse pos)
if( AllSettings::GetLayoutRTL() )
aEvent.mnX = pDispatchFrame->maGeometry.nWidth-1-aEvent.mnX;
@@ -800,7 +799,6 @@ private:
aEvent.mnCode |= KEY_MOD1; // we want zooming, no scrolling
aEvent.mbDeltaIsPixel = TRUE;
- // --- RTL --- (mirror mouse pos)
if( AllSettings::GetLayoutRTL() )
aEvent.mnX = mpFrame->maGeometry.nWidth-1-aEvent.mnX;
@@ -859,7 +857,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
aEvent.mnCode = ImplGetModifierMask( mpFrame->mnLastModifierFlags );
aEvent.mbDeltaIsPixel = TRUE;
- // --- RTL --- (mirror mouse pos)
if( AllSettings::GetLayoutRTL() )
aEvent.mnX = mpFrame->maGeometry.nWidth-1-aEvent.mnX;
@@ -922,7 +919,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
aEvent.mnCode = ImplGetModifierMask( mpFrame->mnLastModifierFlags );
aEvent.mbDeltaIsPixel = FALSE;
- // --- RTL --- (mirror mouse pos)
if( AllSettings::GetLayoutRTL() )
aEvent.mnX = mpFrame->maGeometry.nWidth-1-aEvent.mnX;
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 236c706b9e71..406cf2d9faba 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -289,7 +289,7 @@ void Edit::ImplInitEditData()
mpIMEInfos = nullptr;
mcEchoChar = 0;
- // --- RTL --- no default mirroring for Edit controls
+ // no default mirroring for Edit controls
// note: controls that use a subedit will revert this (SpinField, ComboBox)
EnableRTL( false );
@@ -326,7 +326,7 @@ void Edit::ImplInit(vcl::Window* pParent, WinBits nStyle)
mnAlign = EDIT_ALIGN_LEFT;
- // --- RTL --- hack: right align until keyinput and cursor travelling works
+ // hack: right align until keyinput and cursor travelling works
if( IsRTLEnabled() )
mnAlign = EDIT_ALIGN_RIGHT;
@@ -2192,7 +2192,7 @@ void Edit::StateChanged( StateChangedType nType )
sal_uInt16 nOldAlign = mnAlign;
mnAlign = EDIT_ALIGN_LEFT;
- // --- RTL --- hack: right align until keyinput and cursor travelling works
+ // hack: right align until keyinput and cursor travelling works
// edits are always RTL disabled
// however the parent edits contain the correct setting
if (mbIsSubEdit && GetParent()->IsRTLEnabled())
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index ec2a0e3b1ee7..ce3702169bcb 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1194,7 +1194,6 @@ void OutputDevice::ImplDrawEmphasisMark( long nBaseX, long nX, long nY,
const tools::Rectangle& rRect1, const tools::Rectangle& rRect2 )
{
if( IsRTLEnabled() )
- // --- RTL --- mirror at basex
nX = nBaseX - (nX - nBaseX - 1);
nX -= mnOutOffX;
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 27752f25b47b..a235f1a7e957 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -648,7 +648,7 @@ void OutputDevice::drawOutDevDirect( const OutputDevice* pSrcDev, SalTwoRect& rP
if ( rPosAry.mnSrcWidth && rPosAry.mnSrcHeight && rPosAry.mnDestWidth && rPosAry.mnDestHeight )
{
- // --- RTL --- if this is no window, but pSrcDev is a window
+ // if this is no window, but pSrcDev is a window
// mirroring may be required
// because only windows have a SalGraphicsLayout
// mirroring is performed here
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index 409f4fc108d4..69e473810f74 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -690,7 +690,6 @@ void OutputDevice::ImplDrawTextLine( long nX, long nY,
if ( IsRTLEnabled() )
{
- // --- RTL --- mirror at basex
long nXAdd = nWidth - nDistX;
if( mpFontInstance->mnOrientation )
nXAdd = FRound( nXAdd * cos( mpFontInstance->mnOrientation * F_PI1800 ) );
@@ -803,7 +802,6 @@ void OutputDevice::ImplDrawMnemonicLine( long nX, long nY, long nWidth )
long nBaseX = nX;
if( /*HasMirroredGraphics() &&*/ IsRTLEnabled() )
{
- // --- RTL ---
// add some strange offset
nX += 2;
// revert the hack that will be done later in ImplDrawTextLine
diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx
index ab46546a4daa..9d0f619e833d 100644
--- a/vcl/source/window/clipping.cxx
+++ b/vcl/source/window/clipping.cxx
@@ -38,7 +38,7 @@ void Window::InitClipRegion()
else
{
aRegion = *(ImplGetWinChildClipRegion());
- // --- RTL -- only this region is in frame coordinates, so re-mirror it
+ // only this region is in frame coordinates, so re-mirror it
// the mpWindowImpl->mpPaintRegion above is already correct (see ImplCallPaint()) !
if( ImplIsAntiparallel() )
ReMirror ( aRegion );
@@ -88,7 +88,7 @@ void Window::ExpandPaintClipRegion( const vcl::Region& rRegion )
vcl::Region aDevPixRegion = ImplPixelToDevicePixel( aPixRegion );
vcl::Region aWinChildRegion = *ImplGetWinChildClipRegion();
- // --- RTL -- only this region is in frame coordinates, so re-mirror it
+ // only this region is in frame coordinates, so re-mirror it
if( ImplIsAntiparallel() )
{
const OutputDevice *pOutDev = GetOutDev();
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 656a551d2a55..71de988dfed7 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -307,7 +307,7 @@ Point FloatingWindow::ImplCalcPos( vcl::Window* pWindow,
aPos.X() = devRect.Left()-aSize.Width()+1;
aPos.Y() = devRect.Top();
aPos.Y() -= pWindow->mpWindowImpl->mnTopBorder;
- if( bRTL ) // --- RTL --- we're comparing screen coordinates here
+ if( bRTL )
{
if( (devRectRTL.Right()+aSize.Width()) > aScreenRect.Right() )
bBreak = false;
@@ -331,7 +331,7 @@ Point FloatingWindow::ImplCalcPos( vcl::Window* pWindow,
case FloatWinPopupFlags::Right:
aPos = devRect.TopRight();
aPos.Y() -= pWindow->mpWindowImpl->mnTopBorder;
- if( bRTL ) // --- RTL --- we're comparing screen coordinates here
+ if( bRTL )
{
if( (devRectRTL.Left() - aSize.Width()) < aScreenRect.Left() )
bBreak = false;
@@ -401,7 +401,7 @@ Point FloatingWindow::ImplCalcPos( vcl::Window* pWindow,
}
else
{
- if( bRTL ) // --- RTL --- we're comparing screen coordinates here
+ if( bRTL )
{
if( devRectRTL.Right()-aSize.Width()+1 < aScreenRect.Left() )
aPos.X() -= aScreenRect.Left() - devRectRTL.Right() + aSize.Width() - 1;
@@ -446,7 +446,6 @@ Point FloatingWindow::ImplConvertToAbsPos(vcl::Window* pReference, const Point&
if( pReference->HasMirroredGraphics() )
{
if(!pReference->IsRTLEnabled() )
- // --- RTL --- re-mirror back to get device coordinates
pWindowOutDev->ReMirror( aAbsolute );
tools::Rectangle aRect( pReference->ScreenToOutputPixel(aAbsolute), Size(1,1) ) ;
@@ -471,7 +470,6 @@ tools::Rectangle FloatingWindow::ImplConvertToAbsPos(vcl::Window* pReference, co
if( pReference->HasMirroredGraphics() )
{
if(!pReference->IsRTLEnabled() )
- // --- RTL --- re-mirror back to get device coordinates
pParentWinOutDev->ReMirror(aFloatRect);
aFloatRect.SetPos(pReference->ScreenToOutputPixel(aFloatRect.TopLeft()));
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 10a3820ae7bc..9f258feb7362 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -55,7 +55,6 @@ WindowHitTest Window::ImplHitTest( const Point& rFramePos )
Point aFramePos( rFramePos );
if( ImplIsAntiparallel() )
{
- // - RTL - re-mirror frame pos at this window
const OutputDevice *pOutDev = GetOutDev();
pOutDev->ReMirror( aFramePos );
}
@@ -505,7 +504,6 @@ void Window::SetPointerPosPixel( const Point& rPos )
{
if( !IsRTLEnabled() )
{
- // --- RTL --- (re-mirror mouse pos at this window)
pOutDev->ReMirror( aPos );
}
// mirroring is required here, SetPointerPos bypasses SalGraphics
@@ -533,7 +531,6 @@ Point Window::GetPointerPosPixel()
Point aPos( mpWindowImpl->mpFrameData->mnLastMouseX, mpWindowImpl->mpFrameData->mnLastMouseY );
if( ImplIsAntiparallel() )
{
- // --- RTL --- (re-mirror mouse pos at this window)
const OutputDevice *pOutDev = GetOutDev();
pOutDev->ReMirror( aPos );
}
@@ -546,7 +543,6 @@ Point Window::GetLastPointerPosPixel()
Point aPos( mpWindowImpl->mpFrameData->mnBeforeLastMouseX, mpWindowImpl->mpFrameData->mnBeforeLastMouseY );
if( ImplIsAntiparallel() )
{
- // --- RTL --- (re-mirror mouse pos at this window)
const OutputDevice *pOutDev = GetOutDev();
pOutDev->ReMirror( aPos );
}
@@ -578,7 +574,6 @@ Window::PointerState Window::GetPointerState()
aSalPointerState = mpWindowImpl->mpFrame->GetPointerState();
if( ImplIsAntiparallel() )
{
- // --- RTL --- (re-mirror mouse pos at this window)
const OutputDevice *pOutDev = GetOutDev();
pOutDev->ReMirror( aSalPointerState.maPos );
}
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index d321ed97b916..b54c37aa04c2 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -476,7 +476,7 @@ void Window::PushPaintHelper(PaintHelper *pHelper, vcl::RenderContext& rRenderCo
rPaintRegion = mpWindowImpl->maInvalidateRegion;
tools::Rectangle aPaintRect = rPaintRegion.GetBoundRect();
- // - RTL - re-mirror paint rect and region at this window
+ // RTL: re-mirror paint rect and region at this window
if (ImplIsAntiparallel())
{
rRenderContext.ReMirror(aPaintRect);
@@ -625,8 +625,8 @@ void Window::ImplCallOverlapPaint()
// only then ourself
if ( mpWindowImpl->mnPaintFlags & (ImplPaintFlags::Paint | ImplPaintFlags::PaintChildren) )
{
- // - RTL - notify ImplCallPaint to check for re-mirroring (CHECKRTL)
- // because we were called from the Sal layer
+ // RTL: notify ImplCallPaint to check for re-mirroring
+ // because we were called from the Sal layer
ImplCallPaint(nullptr, mpWindowImpl->mnPaintFlags /*| ImplPaintFlags::CheckRtl */);
}
}
@@ -801,7 +801,7 @@ void Window::ImplInvalidate( const vcl::Region* pRegion, InvalidateFlags nFlags
vcl::Region aRegion( aRect );
if ( pRegion )
{
- // --- RTL --- remirror region before intersecting it
+ // RTL: remirror region before intersecting it
if ( ImplIsAntiparallel() )
{
const OutputDevice *pOutDev = GetOutDev();
@@ -1536,13 +1536,13 @@ void Window::ImplScroll( const tools::Rectangle& rRect,
OutputDevice *pOutDev = GetOutDev();
- // --- RTL --- check if this window requires special action
+ // RTL: check if this window requires special action
bool bReMirror = ( ImplIsAntiparallel() );
tools::Rectangle aRectMirror( rRect );
if( bReMirror )
{
- // --- RTL --- make sure the invalidate region of this window is
+ // make sure the invalidate region of this window is
// computed in the same coordinate space as the one from the overlap windows
pOutDev->ReMirror( aRectMirror );
}
@@ -1552,7 +1552,6 @@ void Window::ImplScroll( const tools::Rectangle& rRect,
ImplCalcOverlapRegion( aRectMirror, aInvalidateRegion, !bScrollChildren, false );
- // --- RTL ---
// if the scrolling on the device is performed in the opposite direction
// then move the overlaps in that direction to compute the invalidate region
// on the correct side, i.e., revert nHorzScroll
@@ -1620,7 +1619,6 @@ void Window::ImplScroll( const tools::Rectangle& rRect,
{
if( bReMirror )
{
- // --- RTL --- frame coordinates require re-mirroring
pOutDev->ReMirror( aRegion );
}
@@ -1642,7 +1640,7 @@ void Window::ImplScroll( const tools::Rectangle& rRect,
if ( !aInvalidateRegion.IsEmpty() )
{
- // --- RTL --- the invalidate region for this windows is already computed in frame coordinates
+ // RTL: the invalidate region for this windows is already computed in frame coordinates
// so it has to be re-mirrored before calling the Paint-handler
mpWindowImpl->mnPaintFlags |= ImplPaintFlags::CheckRtl;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 248397d3fc51..eb5e72e6d30b 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1505,7 +1505,6 @@ void Window::ImplPosSizeWindow( long nX, long nY,
if ( nFlags & PosSizeFlags::X )
{
long nOrgX = nX;
- // --- RTL --- (compare the screen coordinates)
Point aPtDev( Point( nX+mnOutOffX, 0 ) );
OutputDevice *pOutDev = GetOutDev();
if( pOutDev->HasMirroredGraphics() )
@@ -1514,10 +1513,9 @@ void Window::ImplPosSizeWindow( long nX, long nY,
// #106948# always mirror our pos if our parent is not mirroring, even
// if we are also not mirroring
- // --- RTL --- check if parent is in different coordinates
+ // RTL: check if parent is in different coordinates
if( !bnXRecycled && mpWindowImpl->mpParent && !mpWindowImpl->mpParent->mpWindowImpl->mbFrame && mpWindowImpl->mpParent->ImplIsAntiparallel() )
{
- // --- RTL --- (re-mirror at parent window)
nX = mpWindowImpl->mpParent->mnOutWidth - mnOutWidth - nX;
}
/* #i99166# An LTR window in RTL UI that gets sized only would be
@@ -1536,7 +1534,6 @@ void Window::ImplPosSizeWindow( long nX, long nY,
{
// mirrored window in LTR UI
{
- // --- RTL --- (re-mirror at parent window)
nX = mpWindowImpl->mpParent->mnOutWidth - mnOutWidth - nX;
}
}
@@ -1553,7 +1550,7 @@ void Window::ImplPosSizeWindow( long nX, long nY,
}
mpWindowImpl->mnX = nX;
mpWindowImpl->maPos.X() = nOrgX;
- mpWindowImpl->mnAbsScreenX = aPtDev.X(); // --- RTL --- (store real screen pos)
+ mpWindowImpl->mnAbsScreenX = aPtDev.X();
bNewPos = true;
}
}
@@ -2763,7 +2760,6 @@ void Window::setPosSizePixel( long nX, long nY,
}
if( pParent && pParent->ImplIsAntiparallel() )
{
- // --- RTL --- (re-mirror at parent window)
tools::Rectangle aRect( Point ( nX, nY ), Size( nWidth, nHeight ) );
const OutputDevice *pParentOutDev = pParent->GetOutDev();
pParentOutDev->ReMirror( aRect );
@@ -2772,8 +2768,8 @@ void Window::setPosSizePixel( long nX, long nY,
}
if( !(nFlags & PosSizeFlags::X) && bHasValidSize && pWindow->mpWindowImpl->mpFrame->maGeometry.nWidth )
{
- // --- RTL --- make sure the old right aligned position is not changed
- // system windows will always grow to the right
+ // RTL: make sure the old right aligned position is not changed
+ // system windows will always grow to the right
if ( pWinParent )
{
OutputDevice *pParentOutDev = pWinParent->GetOutDev();
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 740680ca6407..9c891ec309d9 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -288,7 +288,7 @@ IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer, void )
Point aMousePos( mpWindowImpl->mpFrameData->mnLastMouseX, mpWindowImpl->mpFrameData->mnLastMouseY );
if( ImplIsAntiparallel() )
{
- // - RTL - re-mirror frame pos at pChild
+ // re-mirror frame pos at pChild
const OutputDevice *pOutDev = GetOutDev();
pOutDev->ReMirror( aMousePos );
}
@@ -355,7 +355,7 @@ void Window::EndTracking( TrackingEventFlags nFlags )
Point aMousePos( mpWindowImpl->mpFrameData->mnLastMouseX, mpWindowImpl->mpFrameData->mnLastMouseY );
if( ImplIsAntiparallel() )
{
- // - RTL - re-mirror frame pos at pChild
+ // re-mirror frame pos at pChild
const OutputDevice *pOutDev = GetOutDev();
pOutDev->ReMirror( aMousePos );
}
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index c66a2c91af47..c44b57db20b5 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -359,7 +359,7 @@ bool ImplHandleMouseEvent( const VclPtr<vcl::Window>& xWindow, MouseNotifyEvent
{
if( pChild->ImplIsAntiparallel() )
{
- // - RTL - re-mirror frame pos at pChild
+ // re-mirror frame pos at pChild
const OutputDevice *pChildWinOutDev = pChild->GetOutDev();
pChildWinOutDev->ReMirror( aMousePos );
}
@@ -971,7 +971,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, MouseNotifyEvent nSVEvent,
if ( !pChild )
return false;
- // --- RTL --- mirror cursor keys
+ // RTL: mirror cursor keys
const OutputDevice *pChildOutDev = pChild->GetOutDev();
if( (aKeyCode.GetCode() == KEY_LEFT || aKeyCode.GetCode() == KEY_RIGHT) &&
pChildOutDev->HasMirroredGraphics() && pChild->IsRTLEnabled() )
@@ -2416,7 +2416,6 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalEvent nEvent, const void* pE
if( AllSettings::GetLayoutRTL() )
{
- // --- RTL --- (mirror paint rect)
SalFrame* pSalFrame = pWindow->ImplGetWindowImpl()->mpFrame;
const_cast<SalPaintEvent *>(pPaintEvt)->mnBoundX = pSalFrame->maGeometry.nWidth-pPaintEvt->mnBoundWidth-pPaintEvt->mnBoundX;
}
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 9f5c6905ed43..f3c47a661d49 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -1938,7 +1938,6 @@ void X11SalFrame::SetPosSize( const tools::Rectangle &rPosSize )
if( mpParent && ! IsSysChildWindow() )
{
- // --- RTL --- (mirror window pos)
if( AllSettings::GetLayoutRTL() )
values.x = mpParent->maGeometry.nWidth-values.width-1-values.x;
@@ -2839,7 +2838,6 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
nEvent = SalEvent::WheelMouse;
- // --- RTL --- (mirror mouse pos)
if( AllSettings::GetLayoutRTL() )
aWheelEvt.mnX = nWidth_-1-aWheelEvt.mnX;
return CallCallback( nEvent, &aWheelEvt );
@@ -2853,7 +2851,6 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
|| pDisplay_->MouseCaptured( this )
)
{
- // --- RTL --- (mirror mouse pos)
if( AllSettings::GetLayoutRTL() )
aMouseEvt.mnX = nWidth_-1-aMouseEvt.mnX;
nRet = CallCallback( nEvent, &aMouseEvt );
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index f97a429af72f..02e06ae8c053 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -2747,7 +2747,6 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
pThis->askForXEmbedFocus( pEvent->time );
}
- // --- RTL --- (mirror mouse pos)
if( AllSettings::GetLayoutRTL() )
aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
@@ -2807,7 +2806,6 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEventScroll* pEvent, gpointer
aEvent.mnCode = GetMouseModCode( pEvent->state );
aEvent.mbHorz = (pEvent->direction == GDK_SCROLL_LEFT || pEvent->direction == GDK_SCROLL_RIGHT);
- // --- RTL --- (mirror mouse pos)
if( AllSettings::GetLayoutRTL() )
aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
@@ -2827,7 +2825,6 @@ gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer
aEvent.mnCode = GetMouseModCode( pEvent->state );
aEvent.mnButton = 0;
- // --- RTL --- (mirror mouse pos)
if( AllSettings::GetLayoutRTL() )
aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 7b42662691bd..bc19821cbdf5 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2644,7 +2644,6 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
aEvent.mnY = (long)pEvent->y_root - pThis->maGeometry.nY;
aEvent.mnCode = GetMouseModCode( pEvent->state );
- // --- RTL --- (mirror mouse pos)
if( AllSettings::GetLayoutRTL() )
aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
@@ -2664,7 +2663,7 @@ gboolean GtkSalFrame::signalScroll(GtkWidget*, GdkEventScroll* pEvent, gpointer
aEvent.mnTime = pEvent->time;
aEvent.mnX = (sal_uLong)pEvent->x;
- // --- RTL --- (mirror mouse pos)
+
if (AllSettings::GetLayoutRTL())
aEvent.mnX = pThis->maGeometry.nWidth - 1 - aEvent.mnX;
aEvent.mnY = (sal_uLong)pEvent->y;
@@ -2814,7 +2813,6 @@ gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer
aEvent.mnCode = GetMouseModCode( pEvent->state );
aEvent.mnButton = 0;
- // --- RTL --- (mirror mouse pos)
if( AllSettings::GetLayoutRTL() )
aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 3fafe257b4fe..e972e9bc5684 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -1291,7 +1291,6 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight,
if ( !(nPosSize & SWP_NOMOVE) && ::GetParent( mhWnd ) )
{
- // --- RTL --- (mirror window pos)
RECT aParentRect;
GetClientRect( ImplGetParentHwnd( mhWnd ), &aParentRect );
if( AllSettings::GetLayoutRTL() )
@@ -3149,7 +3148,6 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg,
if ( nEvent == SalEvent::MouseButtonDown )
UpdateWindow( hWnd );
- // --- RTL --- (mirror mouse pos)
if( AllSettings::GetLayoutRTL() )
aMouseEvt.mnX = pFrame->maGeometry.nWidth-1-aMouseEvt.mnX;
@@ -3233,7 +3231,6 @@ static long ImplHandleWheelMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar
if ( GetKeyState( VK_MENU ) & 0x8000 )
aWheelEvt.mnCode |= KEY_MOD2;
- // --- RTL --- (mirror mouse pos)
if( AllSettings::GetLayoutRTL() )
aWheelEvt.mnX = pFrame->maGeometry.nWidth-1-aWheelEvt.mnX;
More information about the Libreoffice-commits
mailing list