[Libreoffice-commits] core.git: include/vcl vcl/source
Caolán McNamara
caolanm at redhat.com
Mon May 11 07:48:29 PDT 2015
include/vcl/edit.hxx | 3 +-
vcl/source/control/combobox.cxx | 4 +-
vcl/source/control/edit.cxx | 56 ++++++++++++++++++++++------------------
3 files changed, 36 insertions(+), 27 deletions(-)
New commits:
commit 7ac254048a5698e046bbb7deccd171cb3777af61
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 11 15:42:18 2015 +0100
gtk3: put magic 4 behind ImplGetExtraYOffset
and rename ImplGetExtraOffset to ImplGetExtraXOffset
Change-Id: I35fa46521da0db7ae19bf50116484ecbc1f13feb
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 04a5376..a543ce5 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -138,7 +138,8 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
SAL_DLLPRIVATE void ImplSetSelection( const Selection& rSelection, bool bPaint = true );
SAL_DLLPRIVATE int ImplGetNativeControlType() const;
- SAL_DLLPRIVATE long ImplGetExtraOffset() const;
+ SAL_DLLPRIVATE long ImplGetExtraXOffset() const;
+ SAL_DLLPRIVATE long ImplGetExtraYOffset() const;
static SAL_DLLPRIVATE void ImplInvalidateOutermostBorder( vcl::Window* pWin );
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener > mxDnDListener;
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 72acb94..502ab15 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1041,7 +1041,7 @@ Size ComboBox::CalcMinimumSize() const
Size(0xFFFF, 0xFFFF), Size(0xFFFF, 0xFFFF)));
aSz.Width() += aBounds.aSubEditPos.X()*2;
- aSz.Width() += ImplGetExtraOffset() * 2;
+ aSz.Width() += ImplGetExtraXOffset() * 2;
aSz = CalcWindowSize( aSz );
return aSz;
@@ -1106,7 +1106,7 @@ Size ComboBox::CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const
aSz.Width() += GetSettings().GetStyleSettings().GetScrollBarSize();
}
- aSz.Width() += ImplGetExtraOffset() * 2;
+ aSz.Width() += ImplGetExtraXOffset() * 2;
aSz = CalcWindowSize( aSz );
return aSz;
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 5a31215..0d5859e 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -436,7 +436,7 @@ void Edit::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
}
}
-long Edit::ImplGetExtraOffset() const
+long Edit::ImplGetExtraXOffset() const
{
// MT 09/2002: nExtraOffsetX should become a member, instead of checking every time,
// but I need an incompatible update for this...
@@ -448,6 +448,18 @@ long Edit::ImplGetExtraOffset() const
return nExtraOffset;
}
+long Edit::ImplGetExtraYOffset() const
+{
+ long nExtraOffset = 0;
+ int eCtrlType = ImplGetNativeControlType();
+ if (eCtrlType != CTRL_EDITBOX_NOBORDER)
+ {
+ // add some space between text entry and border
+ nExtraOffset = 2;
+ }
+ return nExtraOffset;
+}
+
OUString Edit::ImplGetText() const
{
if ( mcEchoChar || (GetStyle() & WB_PASSWORD) )
@@ -481,9 +493,9 @@ void Edit::ImplInvalidateOrRepaint()
long Edit::ImplGetTextYPosition() const
{
if ( GetStyle() & WB_TOP )
- return ImplGetExtraOffset();
+ return ImplGetExtraXOffset();
else if ( GetStyle() & WB_BOTTOM )
- return GetOutputSizePixel().Height() - GetTextHeight() - ImplGetExtraOffset();
+ return GetOutputSizePixel().Height() - GetTextHeight() - ImplGetExtraXOffset();
return ( GetOutputSizePixel().Height() - GetTextHeight() ) / 2;
}
@@ -515,7 +527,7 @@ void Edit::ImplRepaint(vcl::RenderContext& rRenderContext, bool bLayout)
if (bLayout)
{
- aPos.X() = mnXOffset + ImplGetExtraOffset();
+ aPos.X() = mnXOffset + ImplGetExtraXOffset();
MetricVector* pVector = &mpControlData->mpLayoutData->m_aUnicodeBoundRects;
OUString* pDisplayText = &mpControlData->mpLayoutData->m_aDisplayText;
@@ -560,7 +572,7 @@ void Edit::ImplRepaint(vcl::RenderContext& rRenderContext, bool bLayout)
bool bDrawSelection = maSelection.Len() && (HasFocus() || (GetStyle() & WB_NOHIDESELECTION) || mbActivePopup);
- aPos.X() = mnXOffset + ImplGetExtraOffset();
+ aPos.X() = mnXOffset + ImplGetExtraXOffset();
if (bPaintPlaceholderText)
{
rRenderContext.DrawText(aPos, maPlaceholderText);
@@ -583,8 +595,8 @@ void Edit::ImplRepaint(vcl::RenderContext& rRenderContext, bool bLayout)
for(i = 0; i < aText.getLength(); i++)
{
Rectangle aRect(aPos, Size(10, nTH));
- aRect.Left() = pDX[2 * i] + mnXOffset + ImplGetExtraOffset();
- aRect.Right() = pDX[2 * i + 1] + mnXOffset + ImplGetExtraOffset();
+ aRect.Left() = pDX[2 * i] + mnXOffset + ImplGetExtraXOffset();
+ aRect.Right() = pDX[2 * i + 1] + mnXOffset + ImplGetExtraXOffset();
aRect.Justify();
bool bHighlight = false;
if (i >= aTmpSel.Min() && i < aTmpSel.Max())
@@ -661,8 +673,8 @@ void Edit::ImplRepaint(vcl::RenderContext& rRenderContext, bool bLayout)
while (nIndex < mpIMEInfos->nLen && mpIMEInfos->pAttribs[nIndex] == nAttr) // #112631# check nIndex before using it
{
Rectangle aRect( aPos, Size( 10, nTH ) );
- aRect.Left() = pDX[2 * (nIndex + mpIMEInfos->nPos)] + mnXOffset + ImplGetExtraOffset();
- aRect.Right() = pDX[2 * (nIndex + mpIMEInfos->nPos) + 1] + mnXOffset + ImplGetExtraOffset();
+ aRect.Left() = pDX[2 * (nIndex + mpIMEInfos->nPos)] + mnXOffset + ImplGetExtraXOffset();
+ aRect.Right() = pDX[2 * (nIndex + mpIMEInfos->nPos) + 1] + mnXOffset + ImplGetExtraXOffset();
aRect.Justify();
aClip.Union(aRect);
nIndex++;
@@ -1120,7 +1132,7 @@ void Edit::ImplShowCursor( bool bOnlyIfVisible )
long nCursorWidth = 0;
if ( !mbInsertMode && !maSelection.Len() && (maSelection.Max() < aText.getLength()) )
nCursorWidth = GetTextWidth(aText, maSelection.Max(), 1);
- long nCursorPosX = nTextPos + mnXOffset + ImplGetExtraOffset();
+ long nCursorPosX = nTextPos + mnXOffset + ImplGetExtraXOffset();
// cursor should land in visible area
const Size aOutSize = GetOutputSizePixel();
@@ -1138,18 +1150,18 @@ void Edit::ImplShowCursor( bool bOnlyIfVisible )
}
else
{
- mnXOffset = (aOutSize.Width()-ImplGetExtraOffset()) - nTextPos;
+ mnXOffset = (aOutSize.Width()-ImplGetExtraXOffset()) - nTextPos;
// Etwas mehr?
- if ( (aOutSize.Width()-ImplGetExtraOffset()) < nTextPos )
+ if ( (aOutSize.Width()-ImplGetExtraXOffset()) < nTextPos )
{
- long nMaxNegX = (aOutSize.Width()-ImplGetExtraOffset()) - GetTextWidth( aText );
+ long nMaxNegX = (aOutSize.Width()-ImplGetExtraXOffset()) - GetTextWidth( aText );
mnXOffset -= aOutSize.Width() / 5;
if ( mnXOffset < nMaxNegX ) // beides negativ...
mnXOffset = nMaxNegX;
}
}
- nCursorPosX = nTextPos + mnXOffset + ImplGetExtraOffset();
+ nCursorPosX = nTextPos + mnXOffset + ImplGetExtraXOffset();
if ( nCursorPosX == aOutSize.Width() ) // dann nicht sichtbar...
nCursorPosX--;
@@ -1177,7 +1189,7 @@ void Edit::ImplAlign()
}
else if ( mnAlign == EDIT_ALIGN_RIGHT )
{
- long nMinXOffset = nOutWidth - nTextWidth - 1 - ImplGetExtraOffset();
+ long nMinXOffset = nOutWidth - nTextWidth - 1 - ImplGetExtraXOffset();
bool bRTL = IsRTLEnabled();
if( mbIsSubEdit && GetParent() )
bRTL = GetParent()->IsRTLEnabled();
@@ -1223,7 +1235,7 @@ sal_Int32 Edit::ImplGetCharPos( const Point& rWindowPos ) const
}
GetCaretPositions( aText, pDX, 0, aText.getLength() );
- long nX = rWindowPos.X() - mnXOffset - ImplGetExtraOffset();
+ long nX = rWindowPos.X() - mnXOffset - ImplGetExtraXOffset();
for( sal_Int32 i = 0; i < aText.getLength(); i++ )
{
if( (pDX[2*i] >= nX && pDX[2*i+1] <= nX) ||
@@ -2199,7 +2211,7 @@ void Edit::Command( const CommandEvent& rCEvt )
for ( int nIndex = 0; nIndex < mpIMEInfos->nLen; ++nIndex )
{
Rectangle aRect( aPos, Size( 10, nTH ) );
- aRect.Left() = pDX[2*(nIndex+mpIMEInfos->nPos)] + mnXOffset + ImplGetExtraOffset();
+ aRect.Left() = pDX[2*(nIndex+mpIMEInfos->nPos)] + mnXOffset + ImplGetExtraXOffset();
aRects[ nIndex ] = aRect;
}
SetCompositionCharRect( aRects.get(), mpIMEInfos->nLen );
@@ -2746,7 +2758,7 @@ Size Edit::CalcMinimumSizeForText(const OUString &rString) const
aSize.Height() = nTextHeight;
aSize.Width() = GetTextWidth(aString);
- aSize.Width() += ImplGetExtraOffset() * 2;
+ aSize.Width() += ImplGetExtraXOffset() * 2;
// do not create edit fields in which one cannot enter anything
// a default minimum width should exist for at least 3 characters
@@ -2758,11 +2770,7 @@ Size Edit::CalcMinimumSizeForText(const OUString &rString) const
aSize.Width() = aMinSize.Width();
}
- if (eCtrlType != CTRL_EDITBOX_NOBORDER)
- {
- // add some space between text entry and border
- aSize.Height() += 4;
- }
+ aSize.Height() += ImplGetExtraYOffset() * 2;
aSize = CalcWindowSize( aSize );
@@ -2804,7 +2812,7 @@ Size Edit::CalcSize(sal_Int32 nChars) const
// works only correct for fixed fonts, average otherwise
Size aSz( GetTextWidth( OUString('x') ), GetTextHeight() );
aSz.Width() *= nChars;
- aSz.Width() += ImplGetExtraOffset() * 2;
+ aSz.Width() += ImplGetExtraXOffset() * 2;
aSz = CalcWindowSize( aSz );
return aSz;
}
More information about the Libreoffice-commits
mailing list