[gnome-software/1652-search-row-installed-label-breaks-layout-on-the-left: 2/2] gs-app-row: Remove the 'description_box'
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/1652-search-row-installed-label-breaks-layout-on-the-left: 2/2] gs-app-row: Remove the 'description_box'
- Date: Fri, 4 Mar 2022 12:48:58 +0000 (UTC)
commit f3288b42c64e6487a0a4c98805495885530f2afa
Author: Milan Crha <mcrha redhat com>
Date: Tue Feb 22 14:36:52 2022 +0100
gs-app-row: Remove the 'description_box'
It's empty now.
Related to https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1652
src/gs-app-row.c | 9 ---------
src/gs-app-row.h | 1 -
src/gs-app-row.ui | 6 ------
src/gs-extras-page.c | 4 ----
src/gs-installed-page.c | 4 ----
src/gs-moderate-page.c | 4 ----
src/gs-search-page.c | 4 ----
src/gs-update-list.c | 4 ----
src/gs-updates-page.c | 4 ----
src/gs-updates-section.c | 5 -----
src/gs-updates-section.h | 1 -
11 files changed, 46 deletions(-)
---
diff --git a/src/gs-app-row.c b/src/gs-app-row.c
index 0966fa4cf..df4eb848a 100644
--- a/src/gs-app-row.c
+++ b/src/gs-app-row.c
@@ -30,7 +30,6 @@ typedef struct
GtkWidget *version_update_label;
GtkWidget *system_updates_label; /* Only for "System Updates" app */
GtkWidget *star;
- GtkWidget *description_box;
GtkWidget *description_label;
GtkWidget *button_box;
GtkWidget *button_revealer;
@@ -520,10 +519,6 @@ gs_app_row_actually_refresh (GsAppRow *app_row)
gtk_widget_get_visible (priv->label_installed) ||
gtk_widget_get_visible (priv->label_warning));
- gtk_widget_set_visible (priv->description_box,
- gtk_widget_get_visible (priv->box_tag) ||
- gtk_widget_get_visible (priv->description_label));
-
gtk_label_set_max_width_chars (GTK_LABEL (priv->name_label),
gtk_widget_get_visible (priv->description_label) ? 20 : -1);
}
@@ -823,7 +818,6 @@ gs_app_row_class_init (GsAppRowClass *klass)
gtk_widget_class_bind_template_child_private (widget_class, GsAppRow, version_update_label);
gtk_widget_class_bind_template_child_private (widget_class, GsAppRow, system_updates_label);
gtk_widget_class_bind_template_child_private (widget_class, GsAppRow, star);
- gtk_widget_class_bind_template_child_private (widget_class, GsAppRow, description_box);
gtk_widget_class_bind_template_child_private (widget_class, GsAppRow, description_label);
gtk_widget_class_bind_template_child_private (widget_class, GsAppRow, button_box);
gtk_widget_class_bind_template_child_private (widget_class, GsAppRow, button_revealer);
@@ -859,7 +853,6 @@ gs_app_row_init (GsAppRow *app_row)
void
gs_app_row_set_size_groups (GsAppRow *app_row,
GtkSizeGroup *name,
- GtkSizeGroup *desc,
GtkSizeGroup *button_label,
GtkSizeGroup *button_image)
{
@@ -867,8 +860,6 @@ gs_app_row_set_size_groups (GsAppRow *app_row,
if (name != NULL)
gtk_size_group_add_widget (name, priv->name_box);
- if (desc != NULL)
- gtk_size_group_add_widget (desc, priv->description_box);
gs_progress_button_set_size_groups (GS_PROGRESS_BUTTON (priv->button), button_label, button_image);
}
diff --git a/src/gs-app-row.h b/src/gs-app-row.h
index 560d45c3e..4364b2f5a 100644
--- a/src/gs-app-row.h
+++ b/src/gs-app-row.h
@@ -44,7 +44,6 @@ void gs_app_row_set_show_update (GsAppRow *app_row,
GsApp *gs_app_row_get_app (GsAppRow *app_row);
void gs_app_row_set_size_groups (GsAppRow *app_row,
GtkSizeGroup *name,
- GtkSizeGroup *desc,
GtkSizeGroup *button_label,
GtkSizeGroup *button_image);
void gs_app_row_set_show_installed_size (GsAppRow *app_row,
diff --git a/src/gs-app-row.ui b/src/gs-app-row.ui
index 1cd2af6a6..75fb2f598 100644
--- a/src/gs-app-row.ui
+++ b/src/gs-app-row.ui
@@ -94,12 +94,6 @@
</child>
</object>
</child>
- <child>
- <object class="GtkBox" id="description_box">
- <property name="orientation">horizontal</property>
- <property name="valign">center</property>
- </object>
- </child>
<child>
<object class="GtkLabel" id="label_warning">
<property name="visible">False</property>
diff --git a/src/gs-extras-page.c b/src/gs-extras-page.c
index 736d48f7f..44bfd8257 100644
--- a/src/gs-extras-page.c
+++ b/src/gs-extras-page.c
@@ -46,7 +46,6 @@ struct _GsExtrasPage
GsShell *shell;
GsExtrasPageState state;
GtkSizeGroup *sizegroup_name;
- GtkSizeGroup *sizegroup_desc;
GtkSizeGroup *sizegroup_button_label;
GtkSizeGroup *sizegroup_button_image;
GPtrArray *array_search_data;
@@ -323,7 +322,6 @@ gs_extras_page_add_app (GsExtrasPage *self, GsApp *app, GsAppList *list, SearchD
gtk_list_box_append (GTK_LIST_BOX (self->list_box_results), app_row);
gs_app_row_set_size_groups (GS_APP_ROW (app_row),
self->sizegroup_name,
- self->sizegroup_desc,
self->sizegroup_button_label,
self->sizegroup_button_image);
gtk_widget_show (app_row);
@@ -1275,7 +1273,6 @@ gs_extras_page_dispose (GObject *object)
g_clear_object (&self->search_cancellable);
g_clear_object (&self->sizegroup_name);
- g_clear_object (&self->sizegroup_desc);
g_clear_object (&self->sizegroup_button_label);
g_clear_object (&self->sizegroup_button_image);
g_clear_object (&self->language);
@@ -1298,7 +1295,6 @@ gs_extras_page_init (GsExtrasPage *self)
self->state = GS_EXTRAS_PAGE_STATE_LOADING;
self->sizegroup_name = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- self->sizegroup_desc = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
self->sizegroup_button_label = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
self->sizegroup_button_image = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
self->vendor = gs_vendor_new ();
diff --git a/src/gs-installed-page.c b/src/gs-installed-page.c
index accd7c36b..b93dc0e92 100644
--- a/src/gs-installed-page.c
+++ b/src/gs-installed-page.c
@@ -26,7 +26,6 @@ struct _GsInstalledPage
GsPluginLoader *plugin_loader;
GCancellable *cancellable;
GtkSizeGroup *sizegroup_name;
- GtkSizeGroup *sizegroup_desc;
GtkSizeGroup *sizegroup_button_label;
GtkSizeGroup *sizegroup_button_image;
gboolean cache_valid;
@@ -360,7 +359,6 @@ gs_installed_page_add_app (GsInstalledPage *self, GsAppList *list, GsApp *app)
gs_app_row_set_size_groups (GS_APP_ROW (app_row),
self->sizegroup_name,
- self->sizegroup_desc,
self->sizegroup_button_label,
self->sizegroup_button_image);
@@ -745,7 +743,6 @@ gs_installed_page_dispose (GObject *object)
GsInstalledPage *self = GS_INSTALLED_PAGE (object);
g_clear_object (&self->sizegroup_name);
- g_clear_object (&self->sizegroup_desc);
g_clear_object (&self->sizegroup_button_label);
g_clear_object (&self->sizegroup_button_image);
@@ -816,7 +813,6 @@ gs_installed_page_init (GsInstalledPage *self)
gtk_widget_init_template (GTK_WIDGET (self));
self->sizegroup_name = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- self->sizegroup_desc = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
self->sizegroup_button_label = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
self->sizegroup_button_image = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
diff --git a/src/gs-moderate-page.c b/src/gs-moderate-page.c
index 0deefcfda..75a0657ce 100644
--- a/src/gs-moderate-page.c
+++ b/src/gs-moderate-page.c
@@ -27,7 +27,6 @@ struct _GsModeratePage
GsPluginLoader *plugin_loader;
GCancellable *cancellable;
GtkSizeGroup *sizegroup_name;
- GtkSizeGroup *sizegroup_desc;
GtkSizeGroup *sizegroup_button_label;
GtkSizeGroup *sizegroup_button_image;
GsShell *shell;
@@ -160,7 +159,6 @@ gs_moderate_page_add_app (GsModeratePage *self, GsApp *app)
gtk_list_box_append (GTK_LIST_BOX (self->list_box_install), app_row);
gs_app_row_set_size_groups (GS_APP_ROW (app_row),
self->sizegroup_name,
- self->sizegroup_desc,
self->sizegroup_button_label,
self->sizegroup_button_image);
@@ -362,7 +360,6 @@ gs_moderate_page_dispose (GObject *object)
GsModeratePage *self = GS_MODERATE_PAGE (object);
g_clear_object (&self->sizegroup_name);
- g_clear_object (&self->sizegroup_desc);
g_clear_object (&self->sizegroup_button_label);
g_clear_object (&self->sizegroup_button_image);
@@ -422,7 +419,6 @@ gs_moderate_page_init (GsModeratePage *self)
G_CALLBACK (gs_moderate_page_selection_changed_cb), self);
self->sizegroup_name = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- self->sizegroup_desc = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
self->sizegroup_button_label = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
self->sizegroup_button_image = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
}
diff --git a/src/gs-search-page.c b/src/gs-search-page.c
index 95d5cffe7..dc1fffa26 100644
--- a/src/gs-search-page.c
+++ b/src/gs-search-page.c
@@ -27,7 +27,6 @@ struct _GsSearchPage
GCancellable *cancellable;
GCancellable *search_cancellable;
GtkSizeGroup *sizegroup_name;
- GtkSizeGroup *sizegroup_desc;
GtkSizeGroup *sizegroup_button_label;
GtkSizeGroup *sizegroup_button_image;
GsShell *shell;
@@ -154,7 +153,6 @@ gs_search_page_get_search_cb (GObject *source_object,
gtk_list_box_append (GTK_LIST_BOX (self->list_box_search), app_row);
gs_app_row_set_size_groups (GS_APP_ROW (app_row),
self->sizegroup_name,
- self->sizegroup_desc,
self->sizegroup_button_label,
self->sizegroup_button_image);
gtk_widget_show (app_row);
@@ -476,7 +474,6 @@ gs_search_page_dispose (GObject *object)
GsSearchPage *self = GS_SEARCH_PAGE (object);
g_clear_object (&self->sizegroup_name);
- g_clear_object (&self->sizegroup_desc);
g_clear_object (&self->sizegroup_button_label);
g_clear_object (&self->sizegroup_button_image);
@@ -533,7 +530,6 @@ gs_search_page_init (GsSearchPage *self)
gtk_widget_init_template (GTK_WIDGET (self));
self->sizegroup_name = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- self->sizegroup_desc = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
self->sizegroup_button_label = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
self->sizegroup_button_image = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
diff --git a/src/gs-update-list.c b/src/gs-update-list.c
index 034d60380..facfd71f5 100644
--- a/src/gs-update-list.c
+++ b/src/gs-update-list.c
@@ -19,7 +19,6 @@
typedef struct
{
GtkSizeGroup *sizegroup_name;
- GtkSizeGroup *sizegroup_desc;
GtkListBox *listbox;
} GsUpdateListPrivate;
@@ -63,7 +62,6 @@ gs_update_list_add_app (GsUpdateList *update_list, GsApp *app)
gtk_list_box_append (priv->listbox, app_row);
gs_app_row_set_size_groups (GS_APP_ROW (app_row),
priv->sizegroup_name,
- priv->sizegroup_desc,
NULL,
NULL);
g_signal_connect_object (app, "notify::state",
@@ -94,7 +92,6 @@ gs_update_list_dispose (GObject *object)
}
g_clear_object (&priv->sizegroup_name);
- g_clear_object (&priv->sizegroup_desc);
G_OBJECT_CLASS (gs_update_list_parent_class)->dispose (object);
}
@@ -104,7 +101,6 @@ gs_update_list_init (GsUpdateList *update_list)
{
GsUpdateListPrivate *priv = gs_update_list_get_instance_private (update_list);
priv->sizegroup_name = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- priv->sizegroup_desc = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
priv->listbox = GTK_LIST_BOX (gtk_list_box_new ());
gtk_list_box_set_selection_mode (priv->listbox, GTK_SELECTION_NONE);
diff --git a/src/gs-updates-page.c b/src/gs-updates-page.c
index 1cfef81d6..5d440ccff 100644
--- a/src/gs-updates-page.c
+++ b/src/gs-updates-page.c
@@ -77,7 +77,6 @@ struct _GsUpdatesPage
GtkWidget *label_end_of_life;
GtkSizeGroup *sizegroup_name;
- GtkSizeGroup *sizegroup_desc;
GtkSizeGroup *sizegroup_button_label;
GtkSizeGroup *sizegroup_button_image;
GtkSizeGroup *sizegroup_header;
@@ -1227,7 +1226,6 @@ gs_updates_page_setup (GsPage *page,
self->sections[i] = gs_updates_section_new (i, plugin_loader, page);
gs_updates_section_set_size_groups (self->sections[i],
self->sizegroup_name,
- self->sizegroup_desc,
self->sizegroup_button_label,
self->sizegroup_button_image,
self->sizegroup_header);
@@ -1389,7 +1387,6 @@ gs_updates_page_dispose (GObject *object)
g_clear_object (&self->desktop_settings);
g_clear_object (&self->sizegroup_name);
- g_clear_object (&self->sizegroup_desc);
g_clear_object (&self->sizegroup_button_label);
g_clear_object (&self->sizegroup_button_image);
g_clear_object (&self->sizegroup_header);
@@ -1460,7 +1457,6 @@ gs_updates_page_init (GsUpdatesPage *self)
self->desktop_settings = g_settings_new ("org.gnome.desktop.interface");
self->sizegroup_name = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- self->sizegroup_desc = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
self->sizegroup_button_label = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
self->sizegroup_button_image = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
self->sizegroup_header = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
diff --git a/src/gs-updates-section.c b/src/gs-updates-section.c
index fb04955d3..9e23fbdf6 100644
--- a/src/gs-updates-section.c
+++ b/src/gs-updates-section.c
@@ -41,7 +41,6 @@ struct _GsUpdatesSection
GsPage *page;
GsPluginLoader *plugin_loader;
GtkSizeGroup *sizegroup_name;
- GtkSizeGroup *sizegroup_desc;
GtkSizeGroup *sizegroup_button_label;
GtkSizeGroup *sizegroup_button_image;
GtkSizeGroup *sizegroup_header;
@@ -146,7 +145,6 @@ gs_updates_section_add_app (GsUpdatesSection *self, GsApp *app)
gs_app_row_set_size_groups (GS_APP_ROW (app_row),
self->sizegroup_name,
- self->sizegroup_desc,
self->sizegroup_button_label,
self->sizegroup_button_image);
g_signal_connect_object (app, "notify::state",
@@ -562,7 +560,6 @@ gs_updates_section_dispose (GObject *object)
g_clear_object (&self->plugin_loader);
g_clear_object (&self->page);
g_clear_object (&self->sizegroup_name);
- g_clear_object (&self->sizegroup_desc);
g_clear_object (&self->sizegroup_button_label);
g_clear_object (&self->sizegroup_button_image);
g_clear_object (&self->sizegroup_header);
@@ -624,7 +621,6 @@ gs_updates_section_class_init (GsUpdatesSectionClass *klass)
void
gs_updates_section_set_size_groups (GsUpdatesSection *self,
GtkSizeGroup *name,
- GtkSizeGroup *desc,
GtkSizeGroup *button_label,
GtkSizeGroup *button_image,
GtkSizeGroup *header)
@@ -632,7 +628,6 @@ gs_updates_section_set_size_groups (GsUpdatesSection *self,
g_return_if_fail (GS_IS_UPDATES_SECTION (self));
g_set_object (&self->sizegroup_name, name);
- g_set_object (&self->sizegroup_desc, desc);
g_set_object (&self->sizegroup_button_label, button_label);
g_set_object (&self->sizegroup_button_image, button_image);
g_set_object (&self->sizegroup_header, header);
diff --git a/src/gs-updates-section.h b/src/gs-updates-section.h
index 84b06cfba..d558960b2 100644
--- a/src/gs-updates-section.h
+++ b/src/gs-updates-section.h
@@ -38,7 +38,6 @@ void gs_updates_section_add_app (GsUpdatesSection *self,
void gs_updates_section_remove_all (GsUpdatesSection *self);
void gs_updates_section_set_size_groups (GsUpdatesSection *self,
GtkSizeGroup *name,
- GtkSizeGroup *desc,
GtkSizeGroup *button_label,
GtkSizeGroup *button_image,
GtkSizeGroup *header);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
