From e61afe1e5bbebb42abefac06fa4e961c887dad01 Mon Sep 17 00:00:00 2001 From: Debian QA Group Date: Fri, 26 Oct 2018 02:07:17 +0100 Subject: [PATCH] gtk322 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit commit 2ee38d1881aeea27bb49acc450631d813d1f28ba Author: Hubert Figuière Date: Wed Dec 7 09:44:01 2016 -0500 Bug 13815 - draw event should return TRUE This fix the black drawing regression witj Gtk3.22 Bug: http://bugzilla.abisource.com/13815 Bug-Debian: https://bugs.debian.org/842443 Bug-Ubuntu: https://launchpad.net/bugs/1637893 Gbp-Pq: Name gtk322.patch --- src/af/xap/gtk/xap_UnixFrameImpl.cpp | 6 +++--- src/af/xap/gtk/xap_UnixFrameImpl.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp index 780000e..10f8e00 100644 --- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp +++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp @@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g } #if GTK_CHECK_VERSION(3,0,0) -gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) +gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) #else -gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) +gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) #endif { XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(g_object_get_data(G_OBJECT(w), "user_data")); @@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) pView->draw(&rClip); #endif } - return FALSE; + return TRUE; } static bool bScrollWait = false; diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h index 30ee5d8..a0ff57f 100644 --- a/src/af/xap/gtk/xap_UnixFrameImpl.h +++ b/src/af/xap/gtk/xap_UnixFrameImpl.h @@ -152,9 +152,9 @@ protected: static gint key_release_event(GtkWidget* w, GdkEventKey* e); static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/); #if GTK_CHECK_VERSION(3,0,0) - static gint draw(GtkWidget * w, cairo_t * cr); + static gboolean draw(GtkWidget * w, cairo_t * cr); #else - static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent); + static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent); #endif static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p); static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/); -- 2.30.2