mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: fdo#65635 don't include border gap in height for borderless edits

Browse Source 
Change-Id: If778fdeb5bdbd5a5cac33f57ef8d598ddc1408f2
This commit is contained in:
Caolán McNamara
2013-06-21 13:00:51 +01:00
parent 98c38b02d8
commit 0a5c151b62
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/vcl/edit.hxx
View File

@@ -122,7 +122,7 @@ protected:
SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
SAL_DLLPRIVATE void ImplSetSelection( const Selection& rSelection, sal_Bool bPaint = sal_True );
SAL_DLLPRIVATE int ImplGetNativeControlType();
SAL_DLLPRIVATE int ImplGetNativeControlType() const;
SAL_DLLPRIVATE long ImplGetExtraOffset() const;
static SAL_DLLPRIVATE void ImplInvalidateOutermostBorder( Window* pWin );

16
vcl/source/control/edit.cxx
View File

@@ -1048,10 +1048,10 @@ void Edit::ImplSetText( const OUString& rText, const Selection* pNewSelection )
// -----------------------------------------------------------------------
int Edit::ImplGetNativeControlType()
int Edit::ImplGetNativeControlType() const
{
int nCtrl = 0;
Window *pControl = mbIsSubEdit ? GetParent() : this;
const Window *pControl = mbIsSubEdit ? GetParent() : this;
switch( pControl->GetType() )
{
@@ -2877,6 +2877,8 @@ void Edit::SetSubEdit( Edit* pEdit )
Size Edit::CalcMinimumSizeForText(const OUString &rString) const
{
int eCtrlType = ImplGetNativeControlType();
Size aSize;
if (mnWidthInChars != -1)
{
@@ -2893,8 +2895,12 @@ Size Edit::CalcMinimumSizeForText(const OUString &rString) const
if (aSize.Width() < aMinSize.Width())
aSize.Width() = aMinSize.Width();
}
// add some space between text entry and border
aSize.Height() += 4;
if (eCtrlType != CTRL_EDITBOX_NOBORDER)
{
// add some space between text entry and border
aSize.Height() += 4;
}
aSize = CalcWindowSize( aSize );
@@ -2903,7 +2909,7 @@ Size Edit::CalcMinimumSizeForText(const OUString &rString) const
Rectangle aRect( Point( 0, 0 ), aSize );
Rectangle aContent, aBound;
if( const_cast<Edit*>(this)->GetNativeControlRegion(
CTRL_EDITBOX, PART_ENTIRE_CONTROL,
eCtrlType, PART_ENTIRE_CONTROL,
aRect, 0, aControlValue, OUString(), aBound, aContent) )
{
if( aBound.GetHeight() > aSize.Height() )