[gnome-software: 2/18] gs-sidebar: Add new sidebar widget
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software: 2/18] gs-sidebar: Add new sidebar widget
- Date: Thu, 15 Apr 2021 12:54:05 +0000 (UTC)
commit 8bf5bb11779d56c8fe1fa0542e6ed5a7fea73462
Author: Philip Withnall <pwithnall endlessos org>
Date: Wed Mar 17 15:34:52 2021 +0000
gs-sidebar: Add new sidebar widget
This adds the widget itself, but does not use it in the UI yet.
Signed-off-by: Philip Withnall <pwithnall endlessos org>
Helps: #1111
po/POTFILES.in | 2 +
src/gnome-software.gresource.xml | 1 +
src/gs-shell.c | 2 +
src/gs-shell.ui | 61 ++++
src/gs-sidebar.c | 633 +++++++++++++++++++++++++++++++++++++++
src/gs-sidebar.h | 33 ++
src/gs-sidebar.ui | 17 ++
src/gtk-style-hc.css | 27 ++
src/gtk-style.css | 27 ++
src/meson.build | 1 +
10 files changed, 804 insertions(+)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 38f6e03c1..851ddc0be 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -67,6 +67,8 @@ src/gs-search-page.ui
src/gs-shell.c
src/gs-shell.ui
src/gs-shell-search-provider.c
+src/gs-sidebar.c
+src/gs-sidebar.ui
src/gs-star-widget.ui
src/gs-summary-tile.c
src/gs-summary-tile.ui
diff --git a/src/gnome-software.gresource.xml b/src/gnome-software.gresource.xml
index 924db30c8..81174bd8d 100644
--- a/src/gnome-software.gresource.xml
+++ b/src/gnome-software.gresource.xml
@@ -32,6 +32,7 @@
<file preprocess="xml-stripblanks">gs-screenshot-image.ui</file>
<file preprocess="xml-stripblanks">gs-search-page.ui</file>
<file preprocess="xml-stripblanks">gs-shell.ui</file>
+ <file preprocess="xml-stripblanks">gs-sidebar.ui</file>
<file preprocess="xml-stripblanks">gs-star-widget.ui</file>
<file preprocess="xml-stripblanks">gs-summary-tile.ui</file>
<file preprocess="xml-stripblanks">gs-third-party-repo-row.ui</file>
diff --git a/src/gs-shell.c b/src/gs-shell.c
index 678c10878..3ecf8180a 100644
--- a/src/gs-shell.c
+++ b/src/gs-shell.c
@@ -32,6 +32,7 @@
#include "gs-extras-page.h"
#include "gs-repos-dialog.h"
#include "gs-prefs-dialog.h"
+#include "gs-sidebar.h"
#include "gs-update-dialog.h"
#include "gs-update-monitor.h"
#include "gs-utils.h"
@@ -70,6 +71,7 @@ struct _GsShell
gchar *events_info_uri;
GtkStack *stack_main;
GsPage *page;
+ GsSidebar *sidebar;
GBinding *application_details_header_binding;
diff --git a/src/gs-shell.ui b/src/gs-shell.ui
index a3cb2513d..d948ef089 100644
--- a/src/gs-shell.ui
+++ b/src/gs-shell.ui
@@ -391,6 +391,64 @@
</object>
</child>
+ <child>
+ <object class="HdyLeaflet" id="main_leaflet">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="transition-type">slide</property>
+ <signal name="notify::folded" handler="on_main_leaflet_folded_changed_cb" object="CcWindow"
swapped="yes" />
+
+ <child>
+ <object class="GtkBox" id="sidebar_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkScrolledWindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="vexpand">True</property>
+ <property name="width-request">200</property>
+ <property name="hscrollbar_policy">never</property>
+ <style>
+ <class name="view"/>
+ </style>
+ <child>
+ <object class="GsSidebar" id="sidebar">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <!-- TODO <property name="search-mode" bind-source="search_bar"
bind-property="search-mode-enabled" bind-flags="bidirectional" />
+ <property name="search-query" bind-source="search_entry" bind-property="text"
bind-flags="default" />-->
+ <!-- TODO <signal name="show-panel" handler="show_panel_cb" object="CcWindow"
swapped="yes" />-->
+ <child internal-child="accessible">
+ <object class="AtkObject">
+ <property name="accessible-description" translatable="yes">Navigation
sidebar</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+
+ <child>
+ <object class="GtkSeparator" id="panel_separator">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <style>
+ <class name="sidebar"/>
+ </style>
+ </object>
+ </child>
+
<child>
<object class="GtkBox">
<property name="visible">True</property>
@@ -532,6 +590,9 @@
</child>
</object>
</child>
+
+ </object>
+ </child>
</object>
</child>
</object>
diff --git a/src/gs-sidebar.c b/src/gs-sidebar.c
new file mode 100644
index 000000000..32363ad4d
--- /dev/null
+++ b/src/gs-sidebar.c
@@ -0,0 +1,633 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ * vi:set noexpandtab tabstop=8 shiftwidth=8:
+ *
+ * Copyright (C) 2021 Endless OS Foundation, Inc
+ *
+ * Author: Philip Withnall <pwithnall endlessos org>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+/**
+ * SECTION:gs-sidebar
+ * @short_description: A widget to list pages and categories at the side of a window
+ *
+ * #GsSidebar is a widget which lists the top-level pages and categories which
+ * the user might want to navigate between in GNOME Software. It’s intended to
+ * be used as the left-hand sidebar in the application’s main window.
+ *
+ * Its rows are populated from the pages of the provided #GsSidebar:stack, and
+ * from the categories from the provided #GsSidebar:category-manager.
+ *
+ * Since: 41
+ */
+
+#include "config.h"
+
+#include <glib/gi18n.h>
+
+#include "gs-category.h"
+#include "gs-sidebar.h"
+
+struct _GsSidebar
+{
+ GtkBox parent;
+ GtkListBox *list_box;
+ gint first_category_row_index;
+
+ GtkStack *stack;
+ GHashTable *stack_rows; /* mapping from stack child (GtkWidget) → list box row (GtkListBoxRow)
*/
+
+ GsCategoryManager *category_manager; /* (owned) (nullable) */
+ GHashTable *category_rows; /* mapping from list box row (GtkListBoxRow) → GsCategory */
+};
+
+G_DEFINE_TYPE (GsSidebar, gs_sidebar, GTK_TYPE_BOX)
+
+enum {
+ SIGNAL_CATEGORY_SELECTED,
+};
+
+static guint signals[SIGNAL_CATEGORY_SELECTED + 1] = { 0 };
+
+typedef enum {
+ PROP_STACK = 1,
+ PROP_CATEGORY_MANAGER,
+} GsSidebarProperty;
+
+static GParamSpec *obj_props[PROP_CATEGORY_MANAGER + 1] = { NULL, };
+
+static void
+gs_sidebar_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+ GsSidebar *self = GS_SIDEBAR (object);
+
+ switch ((GsSidebarProperty) prop_id) {
+ case PROP_STACK:
+ g_value_set_object (value, self->stack);
+ break;
+ case PROP_CATEGORY_MANAGER:
+ g_value_set_object (value, self->category_manager);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+gs_sidebar_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+ GsSidebar *self = GS_SIDEBAR (object);
+
+ switch ((GsSidebarProperty) prop_id) {
+ case PROP_STACK:
+ gs_sidebar_set_stack (self, g_value_get_object (value));
+ break;
+ case PROP_CATEGORY_MANAGER:
+ gs_sidebar_set_category_manager (self, g_value_get_object (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+gs_sidebar_dispose (GObject *object)
+{
+ GsSidebar *self = GS_SIDEBAR (object);
+
+ gs_sidebar_set_category_manager (self, NULL);
+ gs_sidebar_set_stack (self, NULL);
+
+ G_OBJECT_CLASS (gs_sidebar_parent_class)->dispose (object);
+}
+
+static void
+gs_sidebar_finalize (GObject *object)
+{
+ GsSidebar *self = GS_SIDEBAR (object);
+
+ g_clear_pointer (&self->stack_rows, g_hash_table_unref);
+ g_clear_pointer (&self->category_rows, g_hash_table_unref);
+
+ G_OBJECT_CLASS (gs_sidebar_parent_class)->finalize (object);
+}
+
+static void
+row_selected_cb (GtkListBox *list_box,
+ GtkListBoxRow *row,
+ gpointer user_data)
+{
+ GsSidebar *self = GS_SIDEBAR (user_data);
+ GHashTableIter iter;
+ gpointer key, value;
+ GsCategory *category;
+
+ /* Is one of the stack pages? */
+ g_hash_table_iter_init (&iter, self->stack_rows);
+ while (g_hash_table_iter_next (&iter, &key, &value)) {
+ GtkWidget *stack_child = key;
+ GtkListBoxRow *possible_row = value;
+
+ if (possible_row == row) {
+ gtk_stack_set_visible_child (self->stack, stack_child);
+ return;
+ }
+ }
+
+ /* Otherwise, is it a category? */
+ category = g_hash_table_lookup (self->category_rows, row);
+ if (category != NULL) {
+ g_signal_emit (self, signals[SIGNAL_CATEGORY_SELECTED], 0, category);
+ return;
+ }
+
+ g_assert_not_reached ();
+}
+
+static void
+gs_sidebar_class_init (GsSidebarClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+ object_class->get_property = gs_sidebar_get_property;
+ object_class->set_property = gs_sidebar_set_property;
+ object_class->dispose = gs_sidebar_dispose;
+ object_class->finalize = gs_sidebar_finalize;
+
+ /**
+ * GsSidebar:stack: (nullable)
+ *
+ * A #GtkStack of pages which should be listed in the sidebar. Selecting
+ * one of these pages in the sidebar will result in it being set as the
+ * visible child in the stack.
+ *
+ * This may be %NULL if no pages are to be listed in the sidebar.
+ *
+ * Since: 41
+ */
+ obj_props[PROP_STACK] =
+ g_param_spec_object ("stack", NULL, NULL,
+ GTK_TYPE_STACK,
+ G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
+
+ /**
+ * GsSidebar:category-manager: (nullable)
+ *
+ * A category manager to provide a list of categories to be displayed in
+ * the sidebar. If a category is selected in the sidebar, the
+ * #GsSidebar:category-selected signal will be emitted.
+ *
+ * This may be %NULL if no categories are to be listed in the sidebar.
+ *
+ * Since: 41
+ */
+ obj_props[PROP_CATEGORY_MANAGER] =
+ g_param_spec_object ("category-manager", NULL, NULL,
+ GS_TYPE_CATEGORY_MANAGER,
+ G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
+
+ g_object_class_install_properties (object_class, G_N_ELEMENTS (obj_props), obj_props);
+
+ /**
+ * GsSidebar::category-selected:
+ * @category: (transfer none) (not nullable): the category which has been selected
+ *
+ * Emitted when a category is selected in the sidebar.
+ *
+ * Since: 41
+ */
+ signals[SIGNAL_CATEGORY_SELECTED] =
+ g_signal_new ("category-selected",
+ G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1, GS_TYPE_CATEGORY);
+
+ gtk_widget_class_set_css_name (widget_class, "sidebar");
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/gs-sidebar.ui");
+
+ gtk_widget_class_bind_template_child (widget_class, GsSidebar, list_box);
+
+ gtk_widget_class_bind_template_callback (widget_class, row_selected_cb);
+}
+
+static void
+header_func (GtkListBoxRow *row, GtkListBoxRow *before, gpointer user_data)
+{
+ GsSidebar *self = GS_SIDEBAR (user_data);
+ GtkListBoxRow *first_category_row = gtk_list_box_get_row_at_index (self->list_box,
self->first_category_row_index);
+
+ /* Put a separator before the first row which doesn’t come from the #GtkStack */
+ if (first_category_row != NULL && row == first_category_row) {
+ GtkWidget *separator;
+
+ separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+ gtk_widget_set_hexpand (separator, TRUE);
+ gtk_widget_show (separator);
+
+ gtk_list_box_row_set_header (row, separator);
+ } else {
+ gtk_list_box_row_set_header (row, NULL);
+ }
+}
+
+static void
+gs_sidebar_init (GsSidebar *self)
+{
+ gtk_widget_set_has_window (GTK_WIDGET (self), FALSE);
+ gtk_widget_init_template (GTK_WIDGET (self));
+
+ self->stack_rows = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+ NULL, NULL);
+ self->first_category_row_index = -1; /* no rows yet */
+
+ self->category_rows = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+ NULL, NULL);
+
+ gtk_list_box_set_header_func (GTK_LIST_BOX (self->list_box),
+ header_func,
+ self,
+ NULL);
+}
+
+static void
+update_row_needs_attention (GtkListBoxRow *row,
+ GtkWidget *label,
+ const gchar *title,
+ gboolean needs_attention)
+{
+ GtkStyleContext *context;
+ AtkObject *label_accessible;
+ g_autofree gchar *name = NULL;
+
+ label_accessible = gtk_widget_get_accessible (label);
+
+ context = gtk_widget_get_style_context (GTK_WIDGET (row));
+ if (needs_attention) {
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_NEEDS_ATTENTION);
+ name = (title != NULL) ? g_strdup_printf (_("%s (needs attention)"), title) : NULL;
+ } else {
+ gtk_style_context_remove_class (context, GTK_STYLE_CLASS_NEEDS_ATTENTION);
+ name = g_strdup (title);
+ }
+
+ if (name != NULL)
+ atk_object_set_name (label_accessible, name);
+}
+
+static GtkListBoxRow *
+add_row (GsSidebar *self,
+ gint position,
+ const gchar *title,
+ const gchar *icon_name,
+ gboolean needs_attention)
+{
+ GtkWidget *row, *box, *image, *label;
+ GtkStyleContext *context;
+ AtkObject *image_accessible, *label_accessible;
+ g_autofree gchar *name = NULL;
+
+ g_debug ("Adding row %s at %d (first non-stack row: %d)",
+ title, position, self->first_category_row_index);
+
+ row = gtk_list_box_row_new ();
+ gtk_widget_set_can_focus (row, TRUE);
+
+ box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+ gtk_container_set_border_width (GTK_CONTAINER (box), 12);
+ gtk_container_add (GTK_CONTAINER (row), box);
+
+ image = gtk_image_new ();
+ gtk_image_set_from_icon_name (GTK_IMAGE (image), icon_name, GTK_ICON_SIZE_BUTTON);
+ context = gtk_widget_get_style_context (image);
+ gtk_style_context_add_class (context, "sidebar-icon");
+ gtk_box_pack_start (GTK_BOX (box), image, FALSE, TRUE, 0);
+
+ label = gtk_label_new (title);
+ gtk_widget_set_hexpand (label, TRUE);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+ gtk_box_pack_start (GTK_BOX (box), label, FALSE, TRUE, 0);
+
+ image_accessible = gtk_widget_get_accessible (image);
+ label_accessible = gtk_widget_get_accessible (label);
+
+ atk_object_add_relationship (image_accessible, ATK_RELATION_LABELLED_BY, label_accessible);
+
+ update_row_needs_attention (GTK_LIST_BOX_ROW (row), label, title, needs_attention);
+
+ gtk_list_box_insert (self->list_box, row, position);
+ gtk_widget_show_all (row);
+
+ return GTK_LIST_BOX_ROW (row);
+}
+
+static void
+notify_visible_child_cb (GObject *object,
+ GParamSpec *pspec,
+ gpointer user_data)
+{
+ GsSidebar *self = GS_SIDEBAR (user_data);
+ GtkWidget *child, *row;
+
+ child = gtk_stack_get_visible_child (self->stack);
+ row = g_hash_table_lookup (self->stack_rows, child);
+ if (row != NULL)
+ gtk_list_box_select_row (self->list_box, GTK_LIST_BOX_ROW (row));
+}
+
+static void
+stack_widget_child_notify_cb (GtkWidget *stack_widget,
+ GParamSpec *child_property,
+ gpointer user_data)
+{
+ GsSidebar *self = GS_SIDEBAR (user_data);
+ GtkListBoxRow *row;
+ GtkWidget *label;
+ g_autofree gchar *title = NULL;
+ gboolean needs_attention;
+ g_autoptr(GList) children = NULL;
+
+ /* Currently we only support needs-attention being updated */
+ if (g_param_spec_get_name (child_property) != g_intern_static_string ("needs-attention"))
+ return;
+
+ row = g_hash_table_lookup (self->stack_rows, stack_widget);
+ if (row == NULL)
+ return;
+
+ gtk_container_child_get (GTK_CONTAINER (self->stack), stack_widget,
+ "title", &title,
+ "needs-attention", &needs_attention,
+ NULL);
+
+ children = gtk_container_get_children (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN (row))));
+ label = g_list_nth_data (children, 1);
+ g_assert (GTK_IS_LABEL (label));
+
+ update_row_needs_attention (row, label, title, needs_attention);
+}
+
+static void
+stack_widget_notify_visible_cb (GObject *obj,
+ GParamSpec *pspec,
+ gpointer user_data)
+{
+ GsSidebar *self = GS_SIDEBAR (user_data);
+ GtkWidget *stack_widget = GTK_WIDGET (obj);
+ GtkWidget *row;
+ g_autofree gchar *title = NULL;
+ g_autofree gchar *icon_name = NULL;
+
+ gtk_container_child_get (GTK_CONTAINER (self->stack), stack_widget,
+ "title", &title,
+ "icon-name", &icon_name,
+ NULL);
+
+ row = g_hash_table_lookup (self->stack_rows, stack_widget);
+ if (row != NULL)
+ gtk_widget_set_visible (row,
+ gtk_widget_get_visible (stack_widget) && (title != NULL || icon_name
!= NULL));
+}
+
+static void
+add_stack_row (GsSidebar *self,
+ GtkWidget *stack_widget)
+{
+ g_autofree gchar *title = NULL;
+ g_autofree gchar *icon_name = NULL;
+ gboolean needs_attention = FALSE;
+ GtkListBoxRow *new_row;
+ gint old_index;
+
+ gtk_container_child_get (GTK_CONTAINER (self->stack), stack_widget,
+ "title", &title,
+ "icon-name", &icon_name,
+ "needs-attention", &needs_attention,
+ NULL);
+
+ old_index = self->first_category_row_index;
+ self->first_category_row_index = (self->first_category_row_index < 0) ? -1 :
self->first_category_row_index + 1;
+ new_row = add_row (self, old_index, title, icon_name, needs_attention);
+ g_hash_table_replace (self->stack_rows, stack_widget, new_row);
+
+ g_signal_connect (stack_widget, "child-notify", G_CALLBACK (stack_widget_child_notify_cb), self);
+ g_signal_connect (stack_widget, "notify::visible", G_CALLBACK (stack_widget_notify_visible_cb), self);
+
+ gtk_widget_set_visible (GTK_WIDGET (new_row),
+ gtk_widget_get_visible (stack_widget) && (title != NULL || icon_name !=
NULL));
+}
+
+static void
+remove_stack_row (GsSidebar *self,
+ GtkWidget *stack_widget)
+{
+ /* Not implemented yet as it’s not needed yet */
+ g_assert_not_reached ();
+}
+
+static void disconnect_stack_signals (GsSidebar *self);
+
+static void
+stack_destroy_cb (GtkWidget *widget,
+ gpointer user_data)
+{
+ GsSidebar *self = GS_SIDEBAR (user_data);
+
+ disconnect_stack_signals (self);
+}
+
+static void
+remove_stack_row_cb (GtkWidget *stack_widget,
+ gpointer user_data)
+{
+ GsSidebar *self = GS_SIDEBAR (user_data);
+
+ remove_stack_row (self, stack_widget);
+}
+
+static void
+clear_stack_rows (GsSidebar *self)
+{
+ gtk_container_foreach (GTK_CONTAINER (self->stack), remove_stack_row_cb, self);
+}
+
+static void
+add_stack_row_cb (GtkWidget *stack_widget,
+ gpointer user_data)
+{
+ GsSidebar *self = GS_SIDEBAR (user_data);
+
+ add_stack_row (self, stack_widget);
+}
+
+static void
+populate_stack_rows (GsSidebar *self)
+{
+ gtk_container_foreach (GTK_CONTAINER (self->stack), add_stack_row_cb, self);
+ notify_visible_child_cb (G_OBJECT (self->stack), NULL, self);
+}
+
+static void
+disconnect_stack_signals (GsSidebar *self)
+{
+ g_signal_handlers_disconnect_by_func (self->stack, notify_visible_child_cb, self);
+ g_signal_handlers_disconnect_by_func (self->stack, stack_destroy_cb, self);
+}
+
+static void
+connect_stack_signals (GsSidebar *self)
+{
+ g_signal_connect (self->stack, "notify::visible-child", G_CALLBACK (notify_visible_child_cb), self);
+ g_signal_connect (self->stack, "destroy", G_CALLBACK (stack_destroy_cb), self);
+}
+
+static void
+add_category_row (GsSidebar *self,
+ GsCategory *category)
+{
+ GtkListBoxRow *new_row;
+
+ new_row = add_row (self,
+ -1,
+ gs_category_get_name (category),
+ gs_category_get_icon_name (category),
+ FALSE /* doesn’t need attention */);
+
+ if (self->first_category_row_index < 0) {
+ self->first_category_row_index = gtk_list_box_row_get_index (new_row);
+ gtk_list_box_invalidate_headers (self->list_box);
+ }
+
+ g_hash_table_replace (self->category_rows, new_row, category);
+}
+
+static void
+remove_category_row (GsSidebar *self,
+ GsCategory *category)
+{
+ /* Not implemented yet as it’s not needed yet */
+ g_assert_not_reached ();
+}
+
+static void
+populate_category_rows (GsSidebar *self)
+{
+ GsCategory * const *categories;
+ gsize n_categories;
+
+ categories = gs_category_manager_get_categories (self->category_manager, &n_categories);
+
+ for (gsize i = 0; i < n_categories; i++)
+ add_category_row (self, categories[i]);
+}
+
+static void
+clear_category_rows (GsSidebar *self)
+{
+ GsCategory * const *categories;
+ gsize n_categories;
+
+ categories = gs_category_manager_get_categories (self->category_manager, &n_categories);
+
+ for (gsize i = 0; i < n_categories; i++)
+ remove_category_row (self, categories[i]);
+}
+
+/**
+ * gs_sidebar_new:
+ *
+ * Create a new #GsSidebar widget.
+ *
+ * Returns: (transfer full): a new #GsSidebar
+ * Since: 41
+ */
+GtkWidget *
+gs_sidebar_new (void)
+{
+ return g_object_new (GS_TYPE_SIDEBAR, NULL);
+}
+
+/**
+ * gs_sidebar_get_stack:
+ * @self: a #GsSidebar
+ *
+ * Get the value of #GsSidebar:stack.
+ *
+ * Returns: (transfer none) (nullable): the stack, or %NULL if none is set
+ * Since: 41
+ */
+GtkStack *
+gs_sidebar_get_stack (GsSidebar *self)
+{
+ g_return_val_if_fail (GS_IS_SIDEBAR (self), NULL);
+
+ return self->stack;
+}
+
+/**
+ * gs_sidebar_set_stack:
+ * @self: a #GsSidebar
+ * @stack: (transfer none) (nullable): a new stack, or %NULL to clear it
+ *
+ * Set the value of #GsSidebar:stack.
+ *
+ * Since: 41
+ */
+void
+gs_sidebar_set_stack (GsSidebar *self,
+ GtkStack *stack)
+{
+ g_return_if_fail (GS_IS_SIDEBAR (self));
+ g_return_if_fail (stack == NULL || GTK_IS_STACK (stack));
+
+ if (self->stack == stack)
+ return;
+
+ if (self->stack != NULL) {
+ disconnect_stack_signals (self);
+ clear_stack_rows (self);
+ }
+
+ g_set_object (&self->stack, stack);
+
+ if (self->stack != NULL) {
+ populate_stack_rows (self);
+ connect_stack_signals (self);
+ }
+
+ g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_STACK]);
+}
+
+/**
+ * gs_sidebar_set_category_manager:
+ * @self: a #GsSidebar
+ * @manager: (transfer none) (nullable): a new category manager, or %NULL to
+ * clear it
+ *
+ * Set the value of #GsSidebar:category-manager.
+ *
+ * Since: 41
+ */
+void
+gs_sidebar_set_category_manager (GsSidebar *self,
+ GsCategoryManager *manager)
+{
+ g_return_if_fail (GS_IS_SIDEBAR (self));
+ g_return_if_fail (manager == NULL || GS_IS_CATEGORY_MANAGER (manager));
+
+ if (self->category_manager == manager)
+ return;
+
+ if (self->category_manager != NULL)
+ clear_category_rows (self);
+
+ g_set_object (&self->category_manager, manager);
+
+ if (self->category_manager != NULL)
+ populate_category_rows (self);
+
+ g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CATEGORY_MANAGER]);
+}
diff --git a/src/gs-sidebar.h b/src/gs-sidebar.h
new file mode 100644
index 000000000..9da794395
--- /dev/null
+++ b/src/gs-sidebar.h
@@ -0,0 +1,33 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ * vi:set noexpandtab tabstop=8 shiftwidth=8:
+ *
+ * Copyright (C) 2021 Endless OS Foundation, Inc
+ *
+ * Author: Philip Withnall <pwithnall endlessos org>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>
+
+#include "gs-category.h"
+#include "gs-category-manager.h"
+
+G_BEGIN_DECLS
+
+#define GS_TYPE_SIDEBAR (gs_sidebar_get_type ())
+G_DECLARE_FINAL_TYPE (GsSidebar, gs_sidebar, GS, SIDEBAR, GtkBox)
+
+GtkWidget *gs_sidebar_new (void);
+
+GtkStack *gs_sidebar_get_stack (GsSidebar *self);
+void gs_sidebar_set_stack (GsSidebar *self,
+ GtkStack *stack);
+
+GsCategoryManager *gs_sidebar_get_category_manager (GsSidebar *self);
+void gs_sidebar_set_category_manager (GsSidebar *self,
+ GsCategoryManager *manager);
+
+G_END_DECLS
diff --git a/src/gs-sidebar.ui b/src/gs-sidebar.ui
new file mode 100644
index 000000000..7e3abfdfd
--- /dev/null
+++ b/src/gs-sidebar.ui
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <template class="GsSidebar" parent="GtkBox">
+ <property name="visible">True</property>
+
+ <child>
+ <object class="GtkListBox" id="list_box">
+ <property name="visible">True</property>
+ <signal name="row-selected" handler="row_selected_cb"/>
+
+ <!-- Rows and separators inserted in code -->
+
+ </object>
+ </child>
+
+ </template>
+</interface>
diff --git a/src/gtk-style-hc.css b/src/gtk-style-hc.css
index 81e399a57..72474cf2f 100644
--- a/src/gtk-style-hc.css
+++ b/src/gtk-style-hc.css
@@ -28,6 +28,33 @@
border-radius: 1px;
}
+/* Adapted from Adwaita’s .needs-attention class for stacksidebar */
+sidebar row.needs-attention > box > label {
+ animation: needs_attention 150ms ease-in;
+ background-image: -gtk-gradient(radial,
+ center center, 0,
+ center center, 0.5,
+ to(@theme_selected_bg_color),
+ to(transparent)),
+ -gtk-gradient(radial,
+ center center, 0,
+ center center, 0.5,
+ to(alpha(@theme_text_color, 0.5)),
+ to(transparent));
+ background-size: 6px 6px, 0 0;
+ background-repeat: no-repeat;
+ background-position: right 3px, right 4px;
+}
+
+sidebar row.needs-attention > box > label:dir(rtl) {
+ background-position: left 3px, left 4px;
+}
+
+sidebar row.needs-attention:selected > box > label {
+ animation: needs_attention 150ms ease-out;
+ background-image: none;
+}
+
.screenshot-image, .screenshot-image-thumb {
background-image: none;
background-color: shade(@theme_bg_color, 0.9);
diff --git a/src/gtk-style.css b/src/gtk-style.css
index 0b24cf759..697e10b69 100644
--- a/src/gtk-style.css
+++ b/src/gtk-style.css
@@ -43,6 +43,33 @@
border-radius: 1px;
}
+/* Adapted from Adwaita’s .needs-attention class for stacksidebar */
+sidebar row.needs-attention > box > label {
+ animation: needs_attention 150ms ease-in;
+ background-image: -gtk-gradient(radial,
+ center center, 0,
+ center center, 0.5,
+ to(@theme_selected_bg_color),
+ to(transparent)),
+ -gtk-gradient(radial,
+ center center, 0,
+ center center, 0.5,
+ to(alpha(@theme_text_color, 0.5)),
+ to(transparent));
+ background-size: 6px 6px, 0 0;
+ background-repeat: no-repeat;
+ background-position: right 3px, right 4px;
+}
+
+sidebar row.needs-attention > box > label:dir(rtl) {
+ background-position: left 3px, left 4px;
+}
+
+sidebar row.needs-attention:selected > box > label {
+ animation: needs_attention 150ms ease-out;
+ background-image: none;
+}
+
.toolbar-primary-buttons-software {
padding-left: 26px;
padding-right: 26px;
diff --git a/src/meson.build b/src/meson.build
index ffd4e7d85..df918440b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -62,6 +62,7 @@ gnome_software_sources = [
'gs-search-page.c',
'gs-shell.c',
'gs-shell-search-provider.c',
+ 'gs-sidebar.c',
'gs-star-widget.c',
'gs-summary-tile.c',
'gs-third-party-repo-row.c',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
