Kaydet (Commit) 11d0bacd authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Adolfo Jayme Barrientos

Resolves: tdf#93847 gtk3: paint blocking is unnecessary and harmful

for gtk3. Probably also a fairly dumb idea for gtk2, but with the
extra unblocking opportunities it probably just "works out ok" in
that model.

Change-Id: I3d4716c691fc84a5e68c210fee51f9e31cfacc02
(cherry picked from commit f9dfd012)
Reviewed-on: https://gerrit.libreoffice.org/19929Reviewed-by: 's avatarAdolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: 's avatarAdolfo Jayme Barrientos <fitojb@ubuntu.com>
üst 5a1d267a
...@@ -947,10 +947,12 @@ void GtkSalFrame::widget_set_size_request(long nWidth, long nHeight) ...@@ -947,10 +947,12 @@ void GtkSalFrame::widget_set_size_request(long nWidth, long nHeight)
{ {
gint nOrigwidth, nOrigheight; gint nOrigwidth, nOrigheight;
gtk_window_get_size(GTK_WINDOW(m_pWindow), &nOrigwidth, &nOrigheight); gtk_window_get_size(GTK_WINDOW(m_pWindow), &nOrigwidth, &nOrigheight);
#if !GTK_CHECK_VERSION(3,0,0)
if (nWidth > nOrigwidth || nHeight > nOrigheight) if (nWidth > nOrigwidth || nHeight > nOrigheight)
{ {
m_bPaintsBlocked = true; m_bPaintsBlocked = true;
} }
#endif
gtk_widget_set_size_request(m_pWindow, nWidth, nHeight ); gtk_widget_set_size_request(m_pWindow, nWidth, nHeight );
} }
...@@ -958,10 +960,12 @@ void GtkSalFrame::window_resize(long nWidth, long nHeight) ...@@ -958,10 +960,12 @@ void GtkSalFrame::window_resize(long nWidth, long nHeight)
{ {
gint nOrigwidth, nOrigheight; gint nOrigwidth, nOrigheight;
gtk_window_get_size(GTK_WINDOW(m_pWindow), &nOrigwidth, &nOrigheight); gtk_window_get_size(GTK_WINDOW(m_pWindow), &nOrigwidth, &nOrigheight);
#if !GTK_CHECK_VERSION(3,0,0)
if (nWidth > nOrigwidth || nHeight > nOrigheight) if (nWidth > nOrigwidth || nHeight > nOrigheight)
{ {
m_bPaintsBlocked = true; m_bPaintsBlocked = true;
} }
#endif
gtk_window_resize(GTK_WINDOW(m_pWindow), nWidth, nHeight); gtk_window_resize(GTK_WINDOW(m_pWindow), nWidth, nHeight);
} }
...@@ -3658,7 +3662,6 @@ void GtkSalFrame::damaged (const basegfx::B2IBox& rDamageRect) ...@@ -3658,7 +3662,6 @@ void GtkSalFrame::damaged (const basegfx::B2IBox& rDamageRect)
gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame ) gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame )
{ {
GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame);
pThis->m_bPaintsBlocked = false;
cairo_save(cr); cairo_save(cr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment