sw/uiconfig/swriter/ui/wordcount.ui | 37 ++++++++++++++++++++++++--
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 7 ++++
2 files changed, 41 insertions(+), 3 deletions(-)
New commits:
commit 2a0b6705724c4ea65b56eb0f45bccfa253d9fdc2
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Mar 6 15:24:08 2015 +0000
clip nwf rendering
Change-Id: Ib42304e9ceb6b49e2dd8ed92f2a86409921e9ef6
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 8e518d6..f294b80 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -910,6 +910,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType,
ControlPart nPart, co
}
cairo_t *cr = getCairoContext();
+ clipRegion(cr);
cairo_translate(cr, rControlRegion.Left(), rControlRegion.Top());
gtk_style_context_save(context);
@@ -956,6 +957,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType,
ControlPart nPart, co
break;
}
+ cairo_surface_flush(cairo_get_target(cr));
cairo_destroy(cr); // unref
mpFrame->damaged(basegfx::B2IBox(rControlRegion.Left(),
rControlRegion.Top(), rControlRegion.Right(), rControlRegion.Bottom()));
commit 59619dbe971852d5cd35dcc3f78eda9bebeb99aa
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Mar 6 09:08:18 2015 +0000
gdk_window_move_region is not helpful
looking into gtk it doesn't move anything, it just
exposes the moved from and moved to areas to force them
to be redrawn, its not in practice an optimization
Change-Id: I38ea91d2463094bab50c436302022849986a3b0c
diff --git a/sw/uiconfig/swriter/ui/wordcount.ui
b/sw/uiconfig/swriter/ui/wordcount.ui
index 588ba0b..9d9e8dc 100644
--- a/sw/uiconfig/swriter/ui/wordcount.ui
+++ b/sw/uiconfig/swriter/ui/wordcount.ui
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.16.1 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="WordCountDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Word Count</property>
- <property name="resizable">False</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -75,6 +74,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -87,6 +88,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -99,6 +102,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -114,6 +119,8 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -129,6 +136,8 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -144,6 +153,8 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -159,6 +170,8 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -174,6 +187,8 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -189,6 +204,8 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -204,6 +221,8 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -219,6 +238,8 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -231,6 +252,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -246,6 +269,8 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -261,6 +286,8 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -273,6 +300,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -288,6 +317,8 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -303,6 +334,8 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 6db5fef..8e518d6 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1536,8 +1536,10 @@ void GtkSalGraphics::copyArea( long nDestX, long nDestY,
long nSrcWidth, long nSrcHeight,
sal_uInt16 nFlags )
{
- mpFrame->pushIgnoreDamage();
+#if 1
SvpSalGraphics::copyArea( nDestX, nDestY, nSrcX, nSrcY, nSrcWidth,
nSrcHeight, nFlags );
+#else
+ mpFrame->pushIgnoreDamage();
mpFrame->popIgnoreDamage();
cairo_rectangle_int_t rect = { (int)nSrcX, (int)nSrcY, (int)nSrcWidth,
(int)nSrcHeight };
@@ -1566,6 +1568,7 @@ void GtkSalGraphics::copyArea( long nDestX, long nDestY,
gdk_window_move_region( gtk_widget_get_window( mpFrame->getWindow() ),
region, nDestX - nSrcX, nDestY - nSrcY );
cairo_region_destroy( region );
+#endif
}
cairo_t* GtkSalGraphics::getCairoContext()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
