KDE4 fix edit box borders

When recalculating the native window frame borders, calculate
using already existing window borders. Otherwise the KDE edit
box results in an unlimited recursion for increasing the
bounding rects, if the control doesn't fit.

Change-Id: I45e51e4796b06097ca537c656f004133dfacd033

vcl/source/window/brdwin.cxx

@@ -530,9 +530,11 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
             if( mbNWFBorder )
             {
                 ImplControlValue aControlValue;
-                Rectangle aCtrlRegion( (const Point&)Point(), Size( mnWidth < 10 ? 10 : mnWidth, mnHeight < 10 ? 10 : mnHeight ) );
-                Rectangle aBounds( aCtrlRegion );
-                Rectangle aContent( aCtrlRegion );
+                Size aMinSize( mnWidth - mnLeftBorder - mnRightBorder, mnHeight - mnTopBorder - mnBottomBorder );
+                if( aMinSize.Width() < 10 ) aMinSize.setWidth( 10 );
+                if( aMinSize.Height() < 10 ) aMinSize.setHeight( 10 );
+                Rectangle aCtrlRegion( Point(mnLeftBorder, mnTopBorder), aMinSize );
+                Rectangle aBounds, aContent;
                 if( pWin->GetNativeControlRegion( aCtrlType, ControlPart::Entire, aCtrlRegion,
                                                   ControlState::ENABLED, aControlValue, OUString(),
                                                   aBounds, aContent ) )

vcl/unx/kde4/KDEData.cxx

@@ -49,6 +49,8 @@ void KDEData::initNWF()
     // Qt theme engines may support a rollover menubar
     pSVData->maNWFData.mbRolloverMenubar = true;
 
+    pSVData->maNWFData.mbNoFocusRects = true;
+
     // Styled menus need additional space
     QStyle *style = QApplication::style();
     pSVData->maNWFData.mnMenuFormatBorderX =

vcl/unx/kde4/KDESalGraphics.cxx

@@ -87,6 +87,7 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart par
         case ControlType::Menubar:
         case ControlType::MenuPopup:
         case ControlType::Editbox:
+        case ControlType::MultilineEditbox:
         case ControlType::Combobox:
         case ControlType::Toolbar:
         case ControlType::Frame:
@@ -406,20 +407,15 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
         draw( QStyle::PE_IndicatorToolBarHandle, &option, m_image.get(),
               vclStateValue2StateFlag(nControlState, value), rect );
     }
-    else if (type == ControlType::Editbox)
+    else if (type == ControlType::Editbox || type == ControlType::MultilineEditbox)
     {
-        QStyleOptionFrameV2 option;
-        draw( QStyle::PE_PanelLineEdit, &option, m_image.get(),
-              vclStateValue2StateFlag(nControlState, value), m_image->rect().adjusted( 2, 2, -2, -2 ));
-
-        draw( QStyle::PE_FrameLineEdit, &option, m_image.get(),
+        lcl_drawFrame( QStyle::PE_FrameLineEdit, m_image.get(),
                        vclStateValue2StateFlag(nControlState, value));
     }
     else if (type == ControlType::Combobox)
     {
         QStyleOptionComboBox option;
         option.editable = true;
-
         draw( QStyle::CC_ComboBox, &option, m_image.get(),
               vclStateValue2StateFlag(nControlState, value) );
     }
@@ -678,32 +674,33 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
                 {
                     int size = QApplication::style()->pixelMetric(
                         QStyle::PM_ButtonDefaultIndicator, &styleOption );
-
                     boundingRect.adjust( -size, -size, size, size );
-
                     retVal = true;
                 }
             }
             break;
         case ControlType::Editbox:
+        case ControlType::MultilineEditbox:
         {
-            int nFontHeight    = QApplication::fontMetrics().height();
-            //int nFrameSize     = QApplication::style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
-            int nLayoutTop     = QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
-            int nLayoutBottom  = QApplication::style()->pixelMetric(QStyle::PM_LayoutBottomMargin);
-            int nLayoutLeft    = QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
-            int nLayoutRight   = QApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin);
-
-            int nMinHeight = (nFontHeight + nLayoutTop + nLayoutBottom);
-            if( boundingRect.height() < nMinHeight )
+            QStyleOptionFrameV3 fo;
+            fo.frameShape = QFrame::StyledPanel;
+            fo.state = QStyle::State_Sunken;
+            fo.lineWidth = QApplication::style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
+            QSize aMinSize = QApplication::style()->
+                sizeFromContents( QStyle::CT_LineEdit, &fo, contentRect.size() );
+            if( aMinSize.height() > boundingRect.height() )
+            {
+                int nHeight = (aMinSize.height() - boundingRect.height()) / 2;
+                assert( 0 == (aMinSize.height() - boundingRect.height()) % 2 );
+                boundingRect.adjust( 0, -nHeight, 0, nHeight );
+            }
+            if( aMinSize.width() > boundingRect.width() )
             {
-                int delta = nMinHeight - boundingRect.height();
-                boundingRect.adjust( 0, 0, 0, delta );
+                int nWidth = (aMinSize.width() - boundingRect.width()) / 2;
+                assert( 0 == (aMinSize.width() - boundingRect.width()) % 2 );
+                boundingRect.adjust( -nWidth, 0, nWidth, 0 );
             }
-            contentRect = boundingRect;
-            contentRect.adjust( -nLayoutLeft+1, -nLayoutTop+1, nLayoutRight-1, nLayoutBottom-1 );
             retVal = true;
-
             break;
         }
         case ControlType::Checkbox: