[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - libreofficekit/source

Michael Meeks michael.meeks at collabora.com
Fri Jan 16 11:18:41 PST 2015


 libreofficekit/source/gtk/lokdocview.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit b79f0c080d17048cf4812bc151155b37e5cdc53c
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Jan 16 18:10:59 2015 +0000

    gtktiledviewer: improve table attach properties.
    
    Conflicts:
    	libreofficekit/source/gtk/lokdocview.c
    
    Change-Id: I344efb9ea71d5eccdfb6255526db912622d115df

diff --git a/libreofficekit/source/gtk/lokdocview.c b/libreofficekit/source/gtk/lokdocview.c
index 60ca589..b335d8b 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -209,7 +209,10 @@ void renderDocument(LOKDocView* pDocView, GdkRectangle* pPartial)
                 gtk_image_set_from_pixbuf(GTK_IMAGE(pDocView->pCanvas[nTile]), pPixBuf);
                 g_object_unref(G_OBJECT(pPixBuf));
                 gtk_widget_show(pDocView->pCanvas[nTile]);
-                gtk_table_attach_defaults(GTK_TABLE(pDocView->pTable), pDocView->pCanvas[nTile], nColumn, nColumn + 1, nRow, nRow + 1);
+                gtk_table_attach(GTK_TABLE(pDocView->pTable),
+                                 pDocView->pCanvas[nTile],
+                                 nColumn, nColumn + 1, nRow, nRow + 1,
+                                 GTK_SHRINK, GTK_SHRINK, 0, 0);
             }
         }
     }


More information about the Libreoffice-commits mailing list