Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions src/bz-article.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include "bz-screenshot-page.h"
#include "bz-state-info.h"
#include "bz-util.h"
#include "bz-window.h"

struct _BzArticle
{
Expand Down Expand Up @@ -347,23 +348,24 @@ static void
screenshot_clicked (GtkButton *button,
gpointer user_data)
{
BzArticle *self = user_data;
guint index = 0;
AdwNavigationPage *page = NULL;
GtkWidget *nav_view = NULL;
BzArticle *self = user_data;
guint index = 0;
GtkWidget *root = NULL;
BzScreenshotPage *page = NULL;

index = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (button), "bz-screenshot-index"));

nav_view = gtk_widget_get_ancestor (GTK_WIDGET (button), ADW_TYPE_NAVIGATION_VIEW);
if (nav_view == NULL)
root = GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (button)));
if (!BZ_IS_WINDOW (root))
return;

page = bz_screenshot_page_new (
page = BZ_SCREENSHOT_PAGE (bz_screenshot_page_new (
G_LIST_MODEL (self->screenshot_textures),
G_LIST_MODEL (self->screenshot_captions),
index);
index,
GTK_WIDGET (button)));

adw_navigation_view_push (ADW_NAVIGATION_VIEW (nav_view), page);
bz_window_open_screenshot_page (BZ_WINDOW (root), page);
}

static GtkWidget *
Expand Down
3 changes: 1 addition & 2 deletions src/bz-full-view.blp
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,6 @@ template $BzFullView: Adw.Bin {
$BzScreenshotsCarousel screenshots {
vexpand: true;
hexpand: true;
clicked => $screenshot_clicked_cb() swapped;
light-accent-color: bind template.ui-entry as <$BzResult>.object as <$BzEntry>.light-accent-color;
dark-accent-color: bind template.ui-entry as <$BzResult>.object as <$BzEntry>.dark-accent-color;

Expand Down Expand Up @@ -733,4 +732,4 @@ template $BzFullView: Adw.Bin {
}
};
};
}
}
32 changes: 0 additions & 32 deletions src/bz-full-view.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,37 +435,6 @@ dl_stats_cb (BzFullView *self,
bz_stats_dialog_animate_open (BZ_STATS_DIALOG (bin));
}

static void
screenshot_clicked_cb (BzFullView *self,
guint index,
BzScreenshotsCarousel *carousel)
{
GListModel *screenshots = NULL;
GListModel *captions = NULL;
AdwNavigationPage *page = NULL;
GtkWidget *nav_view = NULL;
BzEntry *entry = NULL;

screenshots = bz_screenshots_carousel_get_model (carousel);
if (screenshots == NULL)
return;

if (self->ui_entry != NULL)
{
entry = bz_result_get_object (self->ui_entry);
if (entry != NULL)
g_object_get (entry, "screenshot-captions", &captions, NULL);
}

page = bz_screenshot_page_new (screenshots, captions, index);

g_clear_object (&captions);

nav_view = gtk_widget_get_ancestor (GTK_WIDGET (self), ADW_TYPE_NAVIGATION_VIEW);
if (nav_view != NULL)
adw_navigation_view_push (ADW_NAVIGATION_VIEW (nav_view), page);
}

static void
size_cb (BzFullView *self,
GtkButton *button)
Expand Down Expand Up @@ -801,7 +770,6 @@ bz_full_view_class_init (BzFullViewClass *klass)
gtk_widget_class_bind_template_callback (widget_class, open_url_cb);
gtk_widget_class_bind_template_callback (widget_class, license_cb);
gtk_widget_class_bind_template_callback (widget_class, dl_stats_cb);
gtk_widget_class_bind_template_callback (widget_class, screenshot_clicked_cb);
gtk_widget_class_bind_template_callback (widget_class, size_cb);
gtk_widget_class_bind_template_callback (widget_class, formfactor_cb);
gtk_widget_class_bind_template_callback (widget_class, safety_cb);
Expand Down
16 changes: 13 additions & 3 deletions src/bz-screenshot-page.blp
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
using Gtk 4.0;
using Adw 1;

template $BzScreenshotPage: Adw.NavigationPage {
title: _("Screenshots");

template $BzScreenshotPage: Adw.Bin {
child: Adw.BreakpointBin {
width-request: 360;
height-request: 100;
Expand Down Expand Up @@ -34,7 +32,19 @@ template $BzScreenshotPage: Adw.NavigationPage {

show-end-title-buttons: false;
show-start-title-buttons: false;
show-back-button: false;
show-title: false;

[start]
Button back_button {
icon-name: "go-previous-symbolic";
tooltip-text: _("Back");
clicked => $back_clicked() swapped;

styles [
"flat",
]
}
}

content: Overlay {
Expand Down
Loading