[gtk/matthiasc/for-master: 17/17] label: Optimize gtk_label_set_text
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/matthiasc/for-master: 17/17] label: Optimize gtk_label_set_text
- Date: Wed, 11 Nov 2020 15:36:43 +0000 (UTC)
commit 7945069bae629418200e7586851b7ea920a1c295
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Nov 11 10:35:09 2020 -0500
label: Optimize gtk_label_set_text
Labels are cattle, not pets.
gtk/gtklabel.c | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 6aedef6dd0..24da0d3858 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -449,7 +449,7 @@ static gboolean gtk_label_query_tooltip (GtkWidget *widget,
static void gtk_label_set_text_internal (GtkLabel *self,
char *str);
-static void gtk_label_set_label_internal (GtkLabel *self,
+static gboolean gtk_label_set_label_internal (GtkLabel *self,
char *str);
static gboolean gtk_label_set_use_markup_internal (GtkLabel *self,
gboolean val);
@@ -1702,15 +1702,22 @@ gtk_label_set_text_internal (GtkLabel *self,
gtk_label_select_region_index (self, 0, 0);
}
-static void
+static gboolean
gtk_label_set_label_internal (GtkLabel *self,
char *str)
{
- g_free (self->label);
+ if (g_strcmp0 (str, self->label) == 0)
+ {
+ g_free (str);
+ return FALSE;
+ }
+ g_free (self->label);
self->label = str;
g_object_notify_by_pspec (G_OBJECT (self), label_props[PROP_LABEL]);
+
+ return TRUE;
}
static gboolean
@@ -1784,7 +1791,7 @@ gtk_label_recalculate (GtkLabel *self)
* @str: The text you want to set
*
* Sets the text within the #GtkLabel widget. It overwrites any text that
- * was there before.
+ * was there before.
*
* This function will clear any previously set mnemonic accelerators, and
* set the #GtkLabel:use-underline property to %FALSE as a side effect.
@@ -1796,17 +1803,16 @@ gtk_label_recalculate (GtkLabel *self)
**/
void
gtk_label_set_text (GtkLabel *self,
- const char *str)
+ const char *str)
{
g_return_if_fail (GTK_IS_LABEL (self));
-
+
g_object_freeze_notify (G_OBJECT (self));
- gtk_label_set_label_internal (self, g_strdup (str ? str : ""));
- gtk_label_set_use_markup_internal (self, FALSE);
- gtk_label_set_use_underline_internal (self, FALSE);
-
- gtk_label_recalculate (self);
+ if (gtk_label_set_label_internal (self, g_strdup (str ? str : "")) ||
+ gtk_label_set_use_markup_internal (self, FALSE) ||
+ gtk_label_set_use_underline_internal (self, FALSE))
+ gtk_label_recalculate (self);
g_object_thaw_notify (G_OBJECT (self));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]