[balsa/wip/gtk4: 163/351] mime-widgets: Drop some queuing of resizes



commit f0b3228818e808f73badc6c47e8d3d3be44f86c9
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sat Feb 10 21:15:35 2018 -0500

    mime-widgets: Drop some queuing of resizes

 src/balsa-mime-widget-text.c |    3 --
 src/balsa-mime-widget.c      |   57 ------------------------------------------
 src/balsa-mime-widget.h      |    1 -
 3 files changed, 0 insertions(+), 61 deletions(-)
---
diff --git a/src/balsa-mime-widget-text.c b/src/balsa-mime-widget-text.c
index e0e14ea..efb4598 100644
--- a/src/balsa-mime-widget-text.c
+++ b/src/balsa-mime-widget-text.c
@@ -346,9 +346,6 @@ balsa_mime_widget_new_text(BalsaMessage * bm, LibBalsaMessageBody * mime_body,
        phrase_highlight(buffer, "hp-italic", '/', "style", PANGO_STYLE_ITALIC);
     }
 
-    /* size allocation may not be correct, so we'll check back later */
-    balsa_mime_widget_schedule_resize(widget);
-
     g_free(ptr);
 
     mw = (BalsaMimeWidget *) mwt;
diff --git a/src/balsa-mime-widget.c b/src/balsa-mime-widget.c
index c402c60..ff98c99 100644
--- a/src/balsa-mime-widget.c
+++ b/src/balsa-mime-widget.c
@@ -43,8 +43,6 @@ static BalsaMimeWidget *balsa_mime_widget_new_unknown(BalsaMessage * bm,
                                                      const gchar *
                                                      content_type);
 
-static void vadj_change_cb(GtkAdjustment *vadj, GtkWidget *widget);
-
 typedef struct {
     /* display widget */
     GtkWidget *widget;
@@ -152,15 +150,6 @@ balsa_mime_widget_new(BalsaMessage * bm, LibBalsaMessageBody * mime_body, gpoint
            }
 #endif
             g_object_ref_sink(priv->widget);
-
-           if (GTK_IS_LAYOUT(priv->widget)) {
-                GtkAdjustment *vadj;
-
-                g_object_get(G_OBJECT(priv->widget), "vadjustment", &vadj,
-                             NULL);
-               g_signal_connect(vadj, "changed",
-                                 G_CALLBACK(vadj_change_cb), priv->widget);
-            }
        }
     }
     g_free(content_type);
@@ -274,52 +263,6 @@ balsa_mime_widget_new_unknown(BalsaMessage * bm,
     return mw;
 }
 
-
-static guint resize_idle_id;
-
-static GtkWidget *old_widget, *new_widget;
-static gdouble old_upper, new_upper;
-
-static gboolean
-resize_idle(GtkWidget * widget)
-{
-    resize_idle_id = 0;
-    gtk_widget_queue_resize(widget);
-    old_widget = new_widget;
-    old_upper = new_upper;
-
-    return FALSE;
-}
-
-
-void
-balsa_mime_widget_schedule_resize(GtkWidget * widget)
-{
-    g_object_ref(widget);
-    resize_idle_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-                                     (GSourceFunc) resize_idle,
-                                     widget, g_object_unref);
-}
-
-
-static void 
-vadj_change_cb(GtkAdjustment *vadj, GtkWidget *widget)
-{
-    gdouble upper = gtk_adjustment_get_upper(vadj);
-
-    /* do nothing if it's the same widget and the height hasn't changed
-     *
-     * an HtmlView widget seems to grow by 4 pixels each time we resize
-     * it, whence the following unobvious test: */
-    if (widget == old_widget
-        && upper >= old_upper && upper <= old_upper + 4)
-        return;
-    new_widget = widget;
-    new_upper = upper;
-    libbalsa_clear_source_id(&resize_idle_id);
-    balsa_mime_widget_schedule_resize(widget);
-}
-
 /*
  * Getters
  */
diff --git a/src/balsa-mime-widget.h b/src/balsa-mime-widget.h
index afc9511..43375a2 100644
--- a/src/balsa-mime-widget.h
+++ b/src/balsa-mime-widget.h
@@ -54,7 +54,6 @@ G_DECLARE_DERIVABLE_TYPE(BalsaMimeWidget, balsa_mime_widget, BALSA, MIME_WIDGET,
 BalsaMimeWidget *balsa_mime_widget_new(BalsaMessage * bm,
                                       LibBalsaMessageBody * mime_body,
                                       gpointer data);
-void balsa_mime_widget_schedule_resize(GtkWidget * widget);
 
 /*
  * Getters


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]