[Libreoffice-commits] .: 2 commits - basctl/source vcl/unx

[Libreoffice Gerrit user]

 basctl/source/basicide/basobj3.cxx       |    2 +-
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |   20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 08ec85d064107d8186b2ca3a05af63fad6d27cdb
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Sat Oct 13 13:53:07 2012 +0400

    fix String->OUString conversion
    
    Change-Id: Icc21b8998f205b635a21275ea4355824eca83a60

diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 8ab1add..7850b95 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -92,7 +92,7 @@ SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName )
         {
             bool bValid = false;
             OUString aStdMacroText( "Macro" );
-            sal_uInt16 nMacro = 1;
+            sal_Int32 nMacro = 1;
             while ( !bValid )
             {
                 aMacroName = aStdMacroText;
commit 50a20f94869c2033d495da7d57f9948988cd5ad9
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Fri Oct 12 21:55:43 2012 +0400

    gtk: attempt to fix visual glitches around edit fields
    
    Change-Id: I0c97840e610e6f2170a758afbd263ce6cd9e3129

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 6fd600b..0b0c0a0 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -2236,13 +2236,23 @@ static void NWPaintOneEditBox(    SalX11Screen nScreen,
 
     NWSetWidgetState( widget, nState, stateType );
 
-    /* This doesn't seem to be necessary, and it causes some weird glitch in
-     * murrine (with the elementary theme for instance) but it fixes some issue
-     * with Orta, so... */
+    gint xborder = widget->style->xthickness;
+    gint yborder = widget->style->ythickness;
+    gint bInteriorFocus, nFocusLineWidth;
+    gtk_widget_style_get( widget,
+        "interior-focus",   &bInteriorFocus,
+        "focus-line-width", &nFocusLineWidth,
+        (char *)NULL);
+    if ( bInteriorFocus )
+    {
+        xborder += nFocusLineWidth;
+        yborder += nFocusLineWidth;
+    }
+
     gtk_paint_flat_box( widget->style, gdkDrawable, stateType, GTK_SHADOW_NONE,
                         gdkRect, widget, "entry_bg",
-                        aEditBoxRect.Left(), aEditBoxRect.Top(),
-                        aEditBoxRect.GetWidth(), aEditBoxRect.GetHeight() );
+                        aEditBoxRect.Left() + xborder, aEditBoxRect.Top() + yborder,
+                        aEditBoxRect.GetWidth() - 2*xborder, aEditBoxRect.GetHeight() - 2*yborder );
     gtk_paint_shadow( widget->style, gdkDrawable, GTK_STATE_NORMAL, GTK_SHADOW_IN,
                       gdkRect, widget, "entry",
                       aEditBoxRect.Left(), aEditBoxRect.Top(),