p/fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Compare commits

base: p:8da5f807cf8a64c06377f4868f39e84539cc39c8
Branches Tags
p:master
p:v1.0.0
..
compare: p:c64686480500cbcd744f029f4bd5bd5d3003e989
Branches Tags
p:master
p:v1.0.0

No commits in common. "8da5f807cf8a64c06377f4868f39e84539cc39c8" and "c64686480500cbcd744f029f4bd5bd5d3003e989" have entirely different histories.
8da5f807cf ... c646864805

10 changed files with 140 additions and 496 deletions
Show Stats Expand all files Collapse all files

119
fiv-browser.c
View File

@ -1,7 +1,7 @@
//
// fiv-browser.c: filesystem browsing widget
//
// Copyright (c) 2021 - 2023, Přemysl Eric Janouch <p@janouch.name>
// Copyright (c) 2021 - 2022, Přemysl Eric Janouch <p@janouch.name>
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted.
@ -45,12 +45,9 @@
// │ n │ ┊ glow border │ n ┊
// │ g ╰───────────────────╯ g ╰┄┄┄┄┄
// │ s p a c i n g
// │ l a b e l
// │ s p a c i n g
// │ ╭┄┄┄┄┄┄┄┄┄┄┄┄╮ ╭┄┄┄┄┄┄┄┄┄┄┄┄
//
// The glow is actually a glowing margin, the border is rendered in two parts.
// When labels are hidden, the surrounding spacing is collapsed.
//
typedef struct entry Entry;
@ -75,8 +72,6 @@ struct _FivBrowser {
int item_height; ///< Thumbnail height in pixels
int item_spacing; ///< Space between items in pixels
gboolean show_labels; ///< Show labels underneath items
FivIoModel *model; ///< Filesystem model
GArray *entries; ///< []Entry
GArray *layouted_rows; ///< []Row
@ -106,13 +101,10 @@ struct _FivBrowser {
/// The "last modified" timestamp of source images for thumbnails.
static cairo_user_data_key_t fiv_browser_key_mtime_msec;
// TODO(p): Include FivIoModelEntry data by reference.
struct entry {
gchar *uri; ///< GIO URI
gchar *target_uri; ///< GIO URI for any target
gchar *display_name; ///< Label for the file
gint64 mtime_msec; ///< Modification time in milliseconds
cairo_surface_t *thumbnail; ///< Prescaled thumbnail
GIcon *icon; ///< If no thumbnail, use this icon
};
@ -122,7 +114,6 @@ entry_free(Entry *self)
{
g_free(self->uri);
g_free(self->target_uri);
g_free(self->display_name);
g_clear_pointer(&self->thumbnail, cairo_surface_destroy);
g_clear_object(&self->icon);
}
@ -131,8 +122,7 @@ entry_free(Entry *self)
struct item {
const Entry *entry;
PangoLayout *label; ///< Label
int x_offset; ///< X offset within the row
int x_offset; ///< Offset within the row
};
struct row {
@ -145,34 +135,11 @@ struct row {
static void
row_free(Row *self)
{
for (gsize i = 0; i < self->len; i++)
g_clear_object(&self->items[i].label);
g_free(self->items);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
static double
row_subheight(const FivBrowser *self, const Row *row)
{
if (!self->show_labels)
return 0;
// If we didn't ellipsize labels, this should be made to account
// for vertical centering as well.
int tallest_label = 0;
for (gsize i = 0; i < row->len; i++) {
PangoRectangle ink = {}, logical = {};
pango_layout_get_extents(row->items[i].label, &ink, &logical);
int height = (logical.y + logical.height) / PANGO_SCALE;
if (tallest_label < height)
tallest_label = height;
}
return self->item_spacing + tallest_label;
}
static void
append_row(FivBrowser *self, int *y, int x, GArray *items_array)
{
@ -187,7 +154,6 @@ append_row(FivBrowser *self, int *y, int x, GArray *items_array)
// Not trying to pack them vertically, but this would be the place to do it.
*y += self->item_height;
*y += self->item_border_y;
*y += row_subheight(self, &row);
}
static int
@ -200,9 +166,6 @@ relayout(FivBrowser *self, int width)
gtk_style_context_get_padding(style, GTK_STATE_FLAG_NORMAL, &padding);
int available_width = width - padding.left - padding.right, max_width = 0;
// TODO(p): Remember the first visible item and the vertical offset into it,
// then try to ensure its visibility at the end (useful for reloads).
g_array_set_size(self->layouted_rows, 0);
// Whatever self->drag_begin_* used to point at might no longer be there,
// but thumbnail reloading would disrupt mouse clicks if we cleared them.
@ -226,26 +189,8 @@ relayout(FivBrowser *self, int width)
x = 0;
}
PangoLayout *label = NULL;
if (self->show_labels) {
label = gtk_widget_create_pango_layout(widget, entry->display_name);
pango_layout_set_width(
label, (width - 2 * self->glow_w) * PANGO_SCALE);
pango_layout_set_alignment(label, PANGO_ALIGN_CENTER);
pango_layout_set_wrap(label, PANGO_WRAP_WORD_CHAR);
pango_layout_set_ellipsize(label, PANGO_ELLIPSIZE_END);
PangoAttrList *attrs = pango_attr_list_new();
pango_attr_list_insert(attrs, pango_attr_insert_hyphens_new(FALSE));
pango_layout_set_attributes(label, attrs);
pango_attr_list_unref (attrs);
}
g_array_append_val(items, ((Item) {
.entry = entry,
.label = label,
.x_offset = x + self->item_border_x,
}));
g_array_append_val(items,
((Item) {.entry = entry, .x_offset = x + self->item_border_x}));
x += width;
if (max_width < width)
@ -421,16 +366,6 @@ draw_row(FivBrowser *self, cairo_t *cr, const Row *row)
// the whole rectangle with the selection color.
}
if (self->show_labels) {
gtk_style_context_save(style);
gtk_style_context_add_class(style, "label");
gtk_render_layout(style, cr, -border.left,
border.top + extents.height + self->item_border_y +
self->item_spacing,
item->label);
gtk_style_context_restore(style);
}
cairo_restore(cr);
gtk_style_context_restore(style);
}
@ -812,7 +747,6 @@ G_DEFINE_TYPE_EXTENDED(FivBrowser, fiv_browser, GTK_TYPE_WIDGET, 0,
enum {
PROP_THUMBNAIL_SIZE = 1,
PROP_SHOW_LABELS,
N_PROPERTIES,
// These are overriden, we do not register them.
@ -893,9 +827,6 @@ fiv_browser_get_property(
case PROP_THUMBNAIL_SIZE:
g_value_set_enum(value, self->item_size);
break;
case PROP_SHOW_LABELS:
g_value_set_boolean(value, self->show_labels);
break;
case PROP_HADJUSTMENT:
g_value_set_object(value, self->hadjustment);
break;
@ -941,13 +872,6 @@ fiv_browser_set_property(
case PROP_THUMBNAIL_SIZE:
set_item_size(self, g_value_get_enum(value));
break;
case PROP_SHOW_LABELS:
if (self->show_labels != g_value_get_boolean(value)) {
self->show_labels = g_value_get_boolean(value);
gtk_widget_queue_resize(GTK_WIDGET(self));
g_object_notify_by_pspec(object, pspec);
}
break;
case PROP_HADJUSTMENT:
if (replace_adjustment(
self, &self->hadjustment, g_value_get_object(value)))
@ -1359,13 +1283,12 @@ scroll_to_row(FivBrowser *self, const Row *row)
double y1 = gtk_adjustment_get_value(self->vadjustment);
double ph = gtk_adjustment_get_page_size(self->vadjustment);
double sh = self->item_border_y + row_subheight(self, row);
if (row->y_offset < y1) {
gtk_adjustment_set_value(
self->vadjustment, row->y_offset - self->item_border_y);
} else if (row->y_offset + self->item_height + sh > y1 + ph) {
gtk_adjustment_set_value(
self->vadjustment, row->y_offset - ph + self->item_height + sh);
} else if (row->y_offset + self->item_height > y1 + ph) {
gtk_adjustment_set_value(self->vadjustment,
row->y_offset - ph + self->item_height + self->item_border_y);
}
}
@ -1536,16 +1459,20 @@ fiv_browser_query_tooltip(GtkWidget *widget, gint x, gint y,
G_GNUC_UNUSED gboolean keyboard_tooltip, GtkTooltip *tooltip)
{
FivBrowser *self = FIV_BROWSER(widget);
// TODO(p): Consider getting rid of tooltips altogether.
if (self->show_labels)
return FALSE;
const Entry *entry = entry_at(self, x, y);
if (!entry)
return FALSE;
gtk_tooltip_set_text(tooltip, entry->display_name);
GFile *file = g_file_new_for_uri(entry->uri);
GFileInfo *info =
g_file_query_info(file, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
G_FILE_QUERY_INFO_NONE, NULL, NULL);
g_object_unref(file);
if (!info)
return FALSE;
gtk_tooltip_set_text(tooltip, g_file_info_get_display_name(info));
g_object_unref(info);
return TRUE;
}
@ -1626,13 +1553,6 @@ fiv_browser_style_updated(GtkWidget *widget)
gtk_style_context_add_class(style, "item");
gtk_style_context_get_margin(style, GTK_STATE_FLAG_NORMAL, &margin);
gtk_style_context_get_border(style, GTK_STATE_FLAG_NORMAL, &border);
// XXX: Right now, specifying custom fonts within our CSS pseudo-regions
// has no effect, so it might be appropriate to also add .label/.symbolic
// classes here, remember the resulting GTK_STYLE_PROPERTY_FONT,
// and apply them in relayout() with pango_layout_set_font_description().
// There is virtually nothing to be gained from this flexibility, though.
// XXX: We should also invoke relayout() here, because different states
// might theoretically use different fonts.
gtk_style_context_restore(style);
self->glow_w = (margin.left + margin.right) / 2;
@ -1714,9 +1634,6 @@ fiv_browser_class_init(FivBrowserClass *klass)
"thumbnail-size", "Thumbnail size", "The thumbnail height to use",
FIV_TYPE_THUMBNAIL_SIZE, FIV_THUMBNAIL_SIZE_NORMAL,
G_PARAM_READWRITE);
browser_properties[PROP_SHOW_LABELS] = g_param_spec_boolean(
"show-labels", "Show labels", "Whether to show filename labels",
FALSE, G_PARAM_READWRITE);
g_object_class_install_properties(
object_class, N_PROPERTIES, browser_properties);
@ -1786,7 +1703,6 @@ fiv_browser_init(FivBrowser *self)
g_queue_init(&self->thumbnailers_queue);
set_item_size(self, FIV_THUMBNAIL_SIZE_NORMAL);
self->show_labels = FALSE;
self->glow_padded = cairo_pattern_create_rgba(0, 0, 0, 0);
self->glow = cairo_pattern_create_rgba(0, 0, 0, 0);
@ -1825,7 +1741,6 @@ on_model_files_changed(FivIoModel *model, FivBrowser *self)
Entry e = {.thumbnail = NULL,
.uri = g_strdup(files[i].uri),
.target_uri = g_strdup(files[i].target_uri),
.display_name = g_strdup(files[i].display_name),
.mtime_msec = files[i].mtime_msec};
g_array_append_val(self->entries, e);
}

5
fiv-io.c
View File

@ -3049,7 +3049,6 @@ model_entry_finalize(FivIoModelEntry *entry)
{
g_free(entry->uri);
g_free(entry->target_uri);
g_free(entry->display_name);
g_free(entry->collate_key);
}
@ -3172,7 +3171,6 @@ model_reload_to(FivIoModel *self, GFile *directory,
GFileEnumerator *enumerator = g_file_enumerate_children(directory,
G_FILE_ATTRIBUTE_STANDARD_TYPE ","
G_FILE_ATTRIBUTE_STANDARD_NAME ","
G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME ","
G_FILE_ATTRIBUTE_STANDARD_TARGET_URI ","
G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN ","
G_FILE_ATTRIBUTE_TIME_MODIFIED ","
@ -3207,8 +3205,7 @@ model_reload_to(FivIoModel *self, GFile *directory,
FivIoModelEntry entry = {.uri = g_file_get_uri(child),
.target_uri = g_strdup(g_file_info_get_attribute_string(
info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI)),
.display_name = g_strdup(g_file_info_get_display_name(info))};
info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI))};
GDateTime *mtime = g_file_info_get_modification_date_time(info);
if (mtime) {
entry.mtime_msec = g_date_time_to_unix(mtime) * 1000 +

5
fiv-io.h
View File

@ -135,14 +135,9 @@ GFile *fiv_io_model_get_previous_directory(FivIoModel *self);
/// Returns the next VFS directory in order, or NULL.
GFile *fiv_io_model_get_next_directory(FivIoModel *self);
// TODO(p): Turn this into a reference-counted object.
// - If using g_rc_box_*(), we should wrap the {_acquire,_release_full}()
// functions as fiv_io_model_entry_{ref,unref}().
// - Ideally, all the strings would follow the struct immediately.
typedef struct {
gchar *uri; ///< GIO URI
gchar *target_uri; ///< GIO URI for any target
gchar *display_name; ///< Label for the file
gchar *collate_key; ///< Collate key for the filename
gint64 mtime_msec; ///< Modification time in milliseconds
} FivIoModelEntry;

20
fiv-sidebar.c
View File

@ -25,6 +25,7 @@
struct _FivSidebar {
GtkScrolledWindow parent_instance;
GtkPlacesSidebar *places;
GtkWidget *toolbar;
GtkWidget *listbox;
FivIoModel *model;
};
@ -77,7 +78,7 @@ fiv_sidebar_class_init(FivSidebarClass *klass)
// You're giving me no choice, Adwaita.
// Your style is hardcoded to match against the class' CSS name.
// And I need to replicate the internal widget structure.
// And I need replicate the internal widget structure.
gtk_widget_class_set_css_name(widget_class, "placessidebar");
// TODO(p): Consider a return value, and using it.
@ -582,6 +583,12 @@ fiv_sidebar_init(FivSidebar *self)
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(self->places),
GTK_POLICY_NEVER, GTK_POLICY_NEVER);
// None of GtkActionBar, GtkToolbar, .inline-toolbar is appropriate.
// It is either side-favouring borders or excess button padding.
self->toolbar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
gtk_style_context_add_class(
gtk_widget_get_style_context(self->toolbar), GTK_STYLE_CLASS_TOOLBAR);
self->listbox = gtk_list_box_new();
gtk_list_box_set_selection_mode(
GTK_LIST_BOX(self->listbox), GTK_SELECTION_NONE);
@ -595,6 +602,10 @@ fiv_sidebar_init(FivSidebar *self)
GTK_CONTAINER(superbox), GTK_WIDGET(self->places));
gtk_container_add(
GTK_CONTAINER(superbox), gtk_separator_new(GTK_ORIENTATION_VERTICAL));
gtk_container_add(
GTK_CONTAINER(superbox), self->toolbar);
gtk_container_add(
GTK_CONTAINER(superbox), gtk_separator_new(GTK_ORIENTATION_VERTICAL));
gtk_container_add(
GTK_CONTAINER(superbox), self->listbox);
gtk_container_add(GTK_CONTAINER(self), superbox);
@ -637,3 +648,10 @@ fiv_sidebar_show_enter_location(FivSidebar *self)
g_return_if_fail(FIV_IS_SIDEBAR(self));
g_signal_emit_by_name(self->places, "show-enter-location");
}
GtkBox *
fiv_sidebar_get_toolbar(FivSidebar *self)
{
g_return_val_if_fail(FIV_IS_SIDEBAR(self), NULL);
return GTK_BOX(self->toolbar);
}

1
fiv-sidebar.h
View File

@ -26,3 +26,4 @@ G_DECLARE_FINAL_TYPE(FivSidebar, fiv_sidebar, FIV, SIDEBAR, GtkScrolledWindow)
GtkWidget *fiv_sidebar_new(FivIoModel *model);
void fiv_sidebar_show_enter_location(FivSidebar *self);
GtkBox *fiv_sidebar_get_toolbar(FivSidebar *self);

329
fiv.c
View File

@ -129,11 +129,9 @@ static struct key_group help_keys_browser[] = {
{}
}},
{"View", (struct key[]) {
{"F7", "Toggle toolbar"},
{"F9", "Toggle navigation sidebar"},
{"F5 r <Control>r", "Reload"},
{"h <Control>h", "Toggle hiding unsupported files"},
{"t <Control>t", "Toggle showing filenames"},
{"<Control>plus", "Larger thumbnails"},
{"<Control>minus", "Smaller thumbnails"},
{}
@ -152,7 +150,7 @@ static struct key_group help_keys_viewer[] = {
{}
}},
{"View", (struct key[]) {
{"F7", "Toggle toolbar"},
{"F9", "Toggle toolbar"},
{"F5 r <Primary>r", "Reload"},
{}
}},
@ -525,33 +523,6 @@ show_about_dialog(GtkWidget *parent)
// by some minor amount of pixels, margin-wise.
#define B make_toolbar_button
#define T make_toolbar_toggle
#define R make_toolbar_radio
#define BROWSEBAR(XX) \
XX(SIDEBAR, T("sidebar-show-symbolic", "Show sidebar")) \
XX(S1, gtk_separator_new(GTK_ORIENTATION_HORIZONTAL)) \
XX(DIR_PREVIOUS, B("go-previous-symbolic", "Previous directory")) \
XX(DIR_NEXT, B("go-next-symbolic", "Next directory")) \
XX(S2, gtk_separator_new(GTK_ORIENTATION_HORIZONTAL)) \
XX(PLUS, B("zoom-in-symbolic", "Larger thumbnails")) \
XX(MINUS, B("zoom-out-symbolic", "Smaller thumbnails")) \
XX(S3, gtk_separator_new(GTK_ORIENTATION_HORIZONTAL)) \
XX(FILENAMES, T("text-symbolic", "Show filenames")) \
XX(FILTER, T("funnel-symbolic", "Hide unsupported files")) \
XX(S4, gtk_separator_new(GTK_ORIENTATION_HORIZONTAL)) \
XX(SORT_DIR, B("view-sort-ascending-symbolic", "Sort ascending")) \
XX(SORT_NAME, R("Name", "Sort by filename")) \
XX(SORT_TIME, R("Time", "Sort by time of last modification")) \
XX(S5, gtk_separator_new(GTK_ORIENTATION_HORIZONTAL)) \
/* We are YouTube. */ \
XX(FULLSCREEN, B("view-fullscreen-symbolic", "Fullscreen"))
enum {
#define XX(id, constructor) BROWSEBAR_ ## id,
BROWSEBAR(XX)
#undef XX
BROWSEBAR_COUNT
};
#define TOOLBAR(XX) \
XX(BROWSE, B("view-grid-symbolic", "Browse")) \
XX(FILE_PREVIOUS, B("go-previous-symbolic", "Previous file")) \
@ -614,8 +585,11 @@ struct {
GtkWidget *browser_paned;
GtkWidget *browser_sidebar;
GtkWidget *browser_toolbar;
GtkWidget *browsebar[BROWSEBAR_COUNT];
GtkWidget *plus;
GtkWidget *minus;
GtkWidget *funnel;
GtkWidget *sort_field[FIV_IO_MODEL_SORT_COUNT];
GtkWidget *sort_direction[2];
GtkWidget *browser_scroller;
GtkWidget *browser;
@ -797,13 +771,6 @@ on_model_files_changed(FivIoModel *model, G_GNUC_UNUSED gpointer user_data)
g.toolbar[TOOLBAR_FILE_NEXT], g.files->len > 1);
}
static void
on_sidebar_toggled(GtkToggleButton *button, G_GNUC_UNUSED gpointer user_data)
{
gboolean active = gtk_toggle_button_get_active(button);
gtk_widget_set_visible(g.browser_sidebar, active);
}
static void
on_filtering_toggled(GtkToggleButton *button, G_GNUC_UNUSED gpointer user_data)
{
@ -812,19 +779,8 @@ on_filtering_toggled(GtkToggleButton *button, G_GNUC_UNUSED gpointer user_data)
}
static void
on_filenames_toggled(GtkToggleButton *button, G_GNUC_UNUSED gpointer user_data)
on_sort_field(G_GNUC_UNUSED GtkMenuItem *item, gpointer data)
{
gboolean active = gtk_toggle_button_get_active(button);
g_object_set(g.browser, "show-labels", active, NULL);
}
static void
on_sort_field(G_GNUC_UNUSED GtkToggleButton *button, gpointer data)
{
gboolean active = gtk_toggle_button_get_active(button);
if (!active)
return;
int old = -1, new = (int) (intptr_t) data;
g_object_get(g.model, "sort-field", &old, NULL);
if (old != new)
@ -832,12 +788,12 @@ on_sort_field(G_GNUC_UNUSED GtkToggleButton *button, gpointer data)
}
static void
on_sort_direction(G_GNUC_UNUSED GtkToggleButton *button,
G_GNUC_UNUSED gpointer data)
on_sort_direction(G_GNUC_UNUSED GtkMenuItem *item, gpointer data)
{
gboolean old = FALSE;
gboolean old = FALSE, new = (gboolean) (intptr_t) data;
g_object_get(g.model, "sort-descending", &old, NULL);
g_object_set(g.model, "sort-descending", !old, NULL);
if (old != new)
g_object_set(g.model, "sort-descending", new, NULL);
}
static void
@ -1134,16 +1090,6 @@ on_view_drag_data_received(G_GNUC_UNUSED GtkWidget *widget,
g_strfreev(uris);
}
static void
on_notify_sidebar_visible(
GObject *object, GParamSpec *param_spec, G_GNUC_UNUSED gpointer user_data)
{
gboolean b = FALSE;
g_object_get(object, g_param_spec_get_name(param_spec), &b, NULL);
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(g.browsebar[BROWSEBAR_SIDEBAR]), b);
}
static void
on_dir_previous(void)
{
@ -1187,20 +1133,8 @@ on_notify_thumbnail_size(
{
FivThumbnailSize size = 0;
g_object_get(object, g_param_spec_get_name(param_spec), &size, NULL);
gtk_widget_set_sensitive(
g.browsebar[BROWSEBAR_PLUS], size < FIV_THUMBNAIL_SIZE_MAX);
gtk_widget_set_sensitive(
g.browsebar[BROWSEBAR_MINUS], size > FIV_THUMBNAIL_SIZE_MIN);
}
static void
on_notify_show_labels(
GObject *object, GParamSpec *param_spec, G_GNUC_UNUSED gpointer user_data)
{
gboolean show_labels = 0;
g_object_get(object, g_param_spec_get_name(param_spec), &show_labels, NULL);
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(g.browsebar[BROWSEBAR_FILENAMES]), show_labels);
gtk_widget_set_sensitive(g.plus, size < FIV_THUMBNAIL_SIZE_MAX);
gtk_widget_set_sensitive(g.minus, size > FIV_THUMBNAIL_SIZE_MIN);
}
static void
@ -1209,8 +1143,7 @@ on_notify_filtering(
{
gboolean b = FALSE;
g_object_get(object, g_param_spec_get_name(param_spec), &b, NULL);
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(g.browsebar[BROWSEBAR_FILTER]), b);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g.funnel), b);
}
static void
@ -1219,8 +1152,8 @@ on_notify_sort_field(
{
gint field = -1;
g_object_get(object, g_param_spec_get_name(param_spec), &field, NULL);
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(g.browsebar[BROWSEBAR_SORT_NAME + field]), TRUE);
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(g.sort_field[field]), TRUE);
}
static void
@ -1229,18 +1162,8 @@ on_notify_sort_descending(
{
gboolean b = FALSE;
g_object_get(object, g_param_spec_get_name(param_spec), &b, NULL);
const char *title = b
? "Sort ascending"
: "Sort descending";
const char *name = b
? "view-sort-ascending-symbolic"
: "view-sort-descending-symbolic";
GtkButton *button = GTK_BUTTON(g.browsebar[BROWSEBAR_SORT_DIR]);
GtkImage *image = GTK_IMAGE(gtk_button_get_image(button));
gtk_widget_set_tooltip_text(GTK_WIDGET(button), title);
gtk_image_set_from_icon_name(image, name, GTK_ICON_SIZE_BUTTON);
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(g.sort_direction[b]), TRUE);
}
static void
@ -1264,14 +1187,9 @@ on_window_state_event(G_GNUC_UNUSED GtkWidget *widget,
? "view-restore-symbolic"
: "view-fullscreen-symbolic";
gtk_image_set_from_icon_name(
GTK_IMAGE(gtk_button_get_image(
GTK_BUTTON(g.toolbar[TOOLBAR_FULLSCREEN]))),
name, GTK_ICON_SIZE_BUTTON);
gtk_image_set_from_icon_name(
GTK_IMAGE(gtk_button_get_image(
GTK_BUTTON(g.browsebar[BROWSEBAR_FULLSCREEN]))),
name, GTK_ICON_SIZE_BUTTON);
GtkButton *button = GTK_BUTTON(g.toolbar[TOOLBAR_FULLSCREEN]);
GtkImage *image = GTK_IMAGE(gtk_button_get_image(button));
gtk_image_set_from_icon_name(image, name, GTK_ICON_SIZE_BUTTON);
}
static void
@ -1369,7 +1287,7 @@ on_key_press(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
case GDK_CONTROL_MASK | GDK_SHIFT_MASK:
switch (event->keyval) {
case GDK_KEY_h:
gtk_button_clicked(GTK_BUTTON(g.browsebar[BROWSEBAR_FILTER]));
gtk_button_clicked(GTK_BUTTON(g.funnel));
return TRUE;
case GDK_KEY_l:
fiv_sidebar_show_enter_location(FIV_SIDEBAR(g.browser_sidebar));
@ -1466,7 +1384,7 @@ on_key_press_view(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
switch (event->state & gtk_accelerator_get_default_mod_mask()) {
case 0:
switch (event->keyval) {
case GDK_KEY_F7:
case GDK_KEY_F9:
gtk_widget_set_visible(g.view_toolbar,
!gtk_widget_is_visible(g.view_toolbar));
return TRUE;
@ -1503,9 +1421,6 @@ on_key_press_browser_paned(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
case GDK_KEY_r:
load_directory(NULL);
return TRUE;
case GDK_KEY_t:
gtk_button_clicked(GTK_BUTTON(g.browsebar[BROWSEBAR_FILENAMES]));
return TRUE;
}
break;
case GDK_MOD1_MASK:
@ -1528,10 +1443,6 @@ on_key_press_browser_paned(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
break;
case 0:
switch (event->keyval) {
case GDK_KEY_F7:
gtk_widget_set_visible(g.browser_toolbar,
!gtk_widget_is_visible(g.browser_toolbar));
return TRUE;
case GDK_KEY_F9:
gtk_widget_set_visible(g.browser_sidebar,
!gtk_widget_is_visible(g.browser_sidebar));
@ -1548,15 +1459,12 @@ on_key_press_browser_paned(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
fiv_browser_select(FIV_BROWSER(g.browser), NULL);
return TRUE;
case GDK_KEY_h:
gtk_button_clicked(GTK_BUTTON(g.browsebar[BROWSEBAR_FILTER]));
gtk_button_clicked(GTK_BUTTON(g.funnel));
return TRUE;
case GDK_KEY_F5:
case GDK_KEY_r:
load_directory(NULL);
return TRUE;
case GDK_KEY_t:
gtk_button_clicked(GTK_BUTTON(g.browsebar[BROWSEBAR_FILENAMES]));
return TRUE;
}
}
return FALSE;
@ -1635,79 +1543,6 @@ make_toolbar_toggle(const char *symbolic, const char *tooltip)
return button;
}
static GtkWidget *
make_toolbar_radio(const char *label, const char *tooltip)
{
GtkWidget *button = gtk_radio_button_new_with_label(NULL, label);
gtk_widget_set_tooltip_text(button, tooltip);
gtk_widget_set_focus_on_click(button, FALSE);
return button;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
static void
browsebar_connect(int index, GCallback callback)
{
g_signal_connect_swapped(g.browsebar[index], "clicked", callback, NULL);
}
static GtkWidget *
make_browser_toolbar(void)
{
#define XX(id, constructor) g.browsebar[BROWSEBAR_ ## id] = constructor;
BROWSEBAR(XX)
#undef XX
// GtkStatusBar solves a problem we do not have here.
GtkWidget *browser_toolbar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_style_context_add_class(
gtk_widget_get_style_context(browser_toolbar), "fiv-toolbar");
GtkBox *box = GTK_BOX(browser_toolbar);
// Exploring different versions of awkward layouts.
for (int i = 0; i <= BROWSEBAR_S2; i++)
gtk_box_pack_start(box, g.browsebar[i], FALSE, FALSE, 0);
for (int i = BROWSEBAR_COUNT; --i >= BROWSEBAR_S5; )
gtk_box_pack_end(box, g.browsebar[i], FALSE, FALSE, 0);
GtkWidget *center = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
for (int i = BROWSEBAR_S2; ++i < BROWSEBAR_S5; )
gtk_box_pack_start(GTK_BOX(center), g.browsebar[i], FALSE, FALSE, 0);
gtk_box_set_center_widget(box, center);
g_signal_connect(g.browsebar[BROWSEBAR_SIDEBAR], "toggled",
G_CALLBACK(on_sidebar_toggled), NULL);
browsebar_connect(BROWSEBAR_DIR_PREVIOUS, G_CALLBACK(on_dir_previous));
browsebar_connect(BROWSEBAR_DIR_NEXT, G_CALLBACK(on_dir_next));
browsebar_connect(BROWSEBAR_SORT_DIR, G_CALLBACK(on_sort_direction));
browsebar_connect(BROWSEBAR_FULLSCREEN, G_CALLBACK(toggle_fullscreen));
g_signal_connect(g.browsebar[BROWSEBAR_PLUS], "clicked",
G_CALLBACK(on_toolbar_zoom), (gpointer) +1);
g_signal_connect(g.browsebar[BROWSEBAR_MINUS], "clicked",
G_CALLBACK(on_toolbar_zoom), (gpointer) -1);
g_signal_connect(g.browsebar[BROWSEBAR_FILTER], "toggled",
G_CALLBACK(on_filtering_toggled), NULL);
g_signal_connect(g.browsebar[BROWSEBAR_FILENAMES], "toggled",
G_CALLBACK(on_filenames_toggled), NULL);
GtkRadioButton *last = GTK_RADIO_BUTTON(g.browsebar[BROWSEBAR_SORT_NAME]);
for (int i = BROWSEBAR_SORT_NAME; i <= BROWSEBAR_SORT_TIME; i++) {
GtkRadioButton *radio = GTK_RADIO_BUTTON(g.browsebar[i]);
g_signal_connect(radio, "toggled", G_CALLBACK(on_sort_field),
(gpointer) (gintptr) i - BROWSEBAR_SORT_NAME);
gtk_radio_button_join_group(radio, last);
last = radio;
}
return browser_toolbar;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
static void
on_view_actions_changed(void)
{
@ -1853,8 +1688,7 @@ make_view_toolbar(void)
// GtkStatusBar solves a problem we do not have here.
GtkWidget *view_toolbar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_style_context_add_class(
gtk_widget_get_style_context(view_toolbar), "fiv-toolbar");
gtk_widget_set_name(view_toolbar, "toolbar");
GtkBox *box = GTK_BOX(view_toolbar);
// Exploring different versions of awkward layouts.
@ -1945,27 +1779,86 @@ make_browser_sidebar(FivIoModel *model)
g_signal_connect(sidebar, "open-location",
G_CALLBACK(on_open_location), NULL);
g_signal_connect(sidebar, "notify::visible",
G_CALLBACK(on_notify_sidebar_visible), NULL);
g.plus = gtk_button_new_from_icon_name("zoom-in-symbolic",
GTK_ICON_SIZE_BUTTON);
gtk_widget_set_tooltip_text(g.plus, "Larger thumbnails");
g_signal_connect(g.plus, "clicked",
G_CALLBACK(on_toolbar_zoom), (gpointer) +1);
g_object_notify(G_OBJECT(sidebar), "visible");
g.minus = gtk_button_new_from_icon_name("zoom-out-symbolic",
GTK_ICON_SIZE_BUTTON);
gtk_widget_set_tooltip_text(g.minus, "Smaller thumbnails");
g_signal_connect(g.minus, "clicked",
G_CALLBACK(on_toolbar_zoom), (gpointer) -1);
GtkWidget *zoom_group = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_style_context_add_class(
gtk_widget_get_style_context(zoom_group), GTK_STYLE_CLASS_LINKED);
gtk_box_pack_start(GTK_BOX(zoom_group), g.plus, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(zoom_group), g.minus, FALSE, FALSE, 0);
g.funnel = gtk_toggle_button_new();
gtk_container_add(GTK_CONTAINER(g.funnel),
gtk_image_new_from_icon_name("funnel-symbolic", GTK_ICON_SIZE_BUTTON));
gtk_widget_set_tooltip_text(g.funnel, "Hide unsupported files");
g_signal_connect(g.funnel, "toggled",
G_CALLBACK(on_filtering_toggled), NULL);
GtkWidget *menu = gtk_menu_new();
g.sort_field[0] = gtk_radio_menu_item_new_with_mnemonic(NULL, "By _Name");
g.sort_field[1] = gtk_radio_menu_item_new_with_mnemonic(
gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(g.sort_field[0])),
"By _Modification Time");
for (int i = FIV_IO_MODEL_SORT_MIN; i <= FIV_IO_MODEL_SORT_MAX; i++) {
g_signal_connect(g.sort_field[i], "activate",
G_CALLBACK(on_sort_field), (void *) (intptr_t) i);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), g.sort_field[i]);
}
g.sort_direction[0] =
gtk_radio_menu_item_new_with_mnemonic(NULL, "_Ascending");
g.sort_direction[1] = gtk_radio_menu_item_new_with_mnemonic(
gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(g.sort_direction[0])),
"_Descending");
g_signal_connect(g.sort_direction[0], "activate",
G_CALLBACK(on_sort_direction), (void *) 0);
g_signal_connect(g.sort_direction[1], "activate",
G_CALLBACK(on_sort_direction), (void *) 1);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
gtk_menu_shell_append(GTK_MENU_SHELL(menu), g.sort_direction[0]);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), g.sort_direction[1]);
gtk_widget_show_all(menu);
GtkWidget *sort = gtk_menu_button_new();
gtk_widget_set_tooltip_text(sort, "Sort order");
gtk_button_set_image(GTK_BUTTON(sort),
gtk_image_new_from_icon_name(
"view-sort-ascending-symbolic", GTK_ICON_SIZE_BUTTON));
gtk_menu_button_set_popup(GTK_MENU_BUTTON(sort), menu);
GtkWidget *model_group = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_style_context_add_class(
gtk_widget_get_style_context(model_group), GTK_STYLE_CLASS_LINKED);
gtk_box_pack_start(GTK_BOX(model_group), g.funnel, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(model_group), sort, FALSE, FALSE, 0);
GtkBox *toolbar = fiv_sidebar_get_toolbar(FIV_SIDEBAR(sidebar));
gtk_box_pack_start(toolbar, zoom_group, FALSE, FALSE, 0);
gtk_box_pack_start(toolbar, model_group, FALSE, FALSE, 0);
gtk_widget_set_halign(GTK_WIDGET(toolbar), GTK_ALIGN_CENTER);
g_signal_connect(g.browser, "notify::thumbnail-size",
G_CALLBACK(on_notify_thumbnail_size), NULL);
g_signal_connect(g.browser, "notify::show-labels",
G_CALLBACK(on_notify_show_labels), NULL);
g_signal_connect(model, "notify::filtering",
G_CALLBACK(on_notify_filtering), NULL);
g_signal_connect(model, "notify::sort-field",
G_CALLBACK(on_notify_sort_field), NULL);
g_signal_connect(model, "notify::sort-descending",
G_CALLBACK(on_notify_sort_descending), NULL);
on_toolbar_zoom(NULL, (gpointer) 0);
g_object_notify(G_OBJECT(g.model), "filtering");
g_object_notify(G_OBJECT(g.model), "sort-field");
g_object_notify(G_OBJECT(g.model), "sort-descending");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g.funnel), TRUE);
// TODO(p): Invoke sort configuration notifications explicitly.
return sidebar;
}
@ -2018,11 +1911,12 @@ static const char stylesheet[] = "@define-color fiv-tile @content_view_bg; \
@define-color fiv-semiselected \
mix(@theme_selected_bg_color, @content_view_bg, 0.5); \
fiv-view, fiv-browser { background: @content_view_bg; } \
placessidebar.fiv .toolbar { padding: 2px 6px; } \
placessidebar.fiv box > separator { margin: 4px 0; } \
.fiv-toolbar button { padding-left: 0; padding-right: 0; } \
.fiv-toolbar > button:first-child { padding-left: 4px; } \
.fiv-toolbar > button:last-child { padding-right: 4px; } \
.fiv-toolbar separator { \
#toolbar button { padding-left: 0; padding-right: 0; } \
#toolbar > button:first-child { padding-left: 4px; } \
#toolbar > button:last-child { padding-right: 4px; } \
#toolbar separator { \
background: mix(@insensitive_fg_color, \
@insensitive_bg_color, 0.4); margin: 6px 8px; \
} \
@ -2041,12 +1935,6 @@ static const char stylesheet[] = "@define-color fiv-tile @content_view_bg; \
background-size: 40px 40px; \
background-position: 0 0, 0 20px, 20px -20px, -20px 0px; \
} \
fiv-browser.item.label, fiv-browser.item.symbolic.label { \
color: @theme_fg_color; \
} \
fiv-browser.item.label:backdrop:not(:selected) { \
color: @theme_unfocused_fg_color; \
} \
fiv-browser.item:selected { \
color: @theme_selected_bg_color; \
border-color: @theme_selected_bg_color; \
@ -2252,7 +2140,7 @@ main(int argc, char *argv[])
G_CALLBACK(on_view_drag_data_received), NULL);
gtk_container_add(GTK_CONTAINER(view_scroller), g.view);
// We need to hide it together with its separator.
// We need to hide it together with the separator.
g.view_toolbar = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(g.view_toolbar),
make_view_toolbar(), FALSE, FALSE, 0);
@ -2292,23 +2180,10 @@ main(int argc, char *argv[])
G_CALLBACK(on_item_activated), NULL);
gtk_container_add(GTK_CONTAINER(g.browser_scroller), g.browser);
// We need to hide it together with its separator.
g.browser_toolbar = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(g.browser_toolbar),
make_browser_toolbar(), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(g.browser_toolbar),
gtk_separator_new(GTK_ORIENTATION_VERTICAL), FALSE, FALSE, 0);
GtkWidget *browser_right = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(browser_right),
g.browser_toolbar, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(browser_right),
g.browser_scroller, TRUE, TRUE, 0);
g.browser_sidebar = make_browser_sidebar(g.model);
g.browser_paned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
gtk_paned_add1(GTK_PANED(g.browser_paned), g.browser_sidebar);
gtk_paned_add2(GTK_PANED(g.browser_paned), browser_right);
gtk_paned_add2(GTK_PANED(g.browser_paned), g.browser_scroller);
g_signal_connect(g.browser_paned, "key-press-event",
G_CALLBACK(on_key_press_browser_paned), NULL);
g_signal_connect(g.browser_paned, "button-press-event",
@ -2342,8 +2217,6 @@ main(int argc, char *argv[])
gtk_widget_show_all(menu_box);
gtk_widget_set_visible(g.browser_sidebar,
g_settings_get_boolean(settings, "show-browser-sidebar"));
gtk_widget_set_visible(g.browser_toolbar,
g_settings_get_boolean(settings, "show-browser-toolbar"));
gtk_widget_set_visible(g.view_toolbar,
g_settings_get_boolean(settings, "show-view-toolbar"));

4
fiv.gschema.xml
View File

@ -25,10 +25,6 @@
<default>true</default>
<summary>Show the browser's sidebar</summary>
</key>
<key name='show-browser-toolbar' type='b'>
<default>true</default>
<summary>Show a toolbar in the browser view</summary>
</key>
<key name='show-view-toolbar' type='b'>
<default>true</default>
<summary>Show a toolbar in the image view</summary>

1
resources/resources.gresource.xml
View File

@ -4,7 +4,6 @@
<file alias="LICENSE">../LICENSE</file>
</gresource>
<gresource prefix="/org/gnome/design/IconLibrary/scalable/actions/">
<file preprocess="xml-stripblanks">text-symbolic.svg</file>
<file preprocess="xml-stripblanks">circle-filled-symbolic.svg</file>
<file preprocess="xml-stripblanks">funnel-symbolic.svg</file>
<file preprocess="xml-stripblanks">blend-tool-symbolic.svg</file>

150
resources/text-symbolic.svg
View File

@ -1,150 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<filter id="a" height="100%" width="100%" x="0%" y="0%">
<feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
</filter>
<mask id="b">
<g filter="url(#a)">
<path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.3"/>
</g>
</mask>
<clipPath id="c">
<path d="m 0 0 h 1024 v 800 h -1024 z"/>
</clipPath>
<mask id="d">
<g filter="url(#a)">
<path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.05"/>
</g>
</mask>
<clipPath id="e">
<path d="m 0 0 h 1024 v 800 h -1024 z"/>
</clipPath>
<mask id="f">
<g filter="url(#a)">
<path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.05"/>
</g>
</mask>
<clipPath id="g">
<path d="m 0 0 h 1024 v 800 h -1024 z"/>
</clipPath>
<mask id="h">
<g filter="url(#a)">
<path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.05"/>
</g>
</mask>
<clipPath id="i">
<path d="m 0 0 h 1024 v 800 h -1024 z"/>
</clipPath>
<mask id="j">
<g filter="url(#a)">
<path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.05"/>
</g>
</mask>
<clipPath id="k">
<path d="m 0 0 h 1024 v 800 h -1024 z"/>
</clipPath>
<mask id="l">
<g filter="url(#a)">
<path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.05"/>
</g>
</mask>
<clipPath id="m">
<path d="m 0 0 h 1024 v 800 h -1024 z"/>
</clipPath>
<mask id="n">
<g filter="url(#a)">
<path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.05"/>
</g>
</mask>
<clipPath id="o">
<path d="m 0 0 h 1024 v 800 h -1024 z"/>
</clipPath>
<mask id="p">
<g filter="url(#a)">
<path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.3"/>
</g>
</mask>
<clipPath id="q">
<path d="m 0 0 h 1024 v 800 h -1024 z"/>
</clipPath>
<mask id="r">
<g filter="url(#a)">
<path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.5"/>
</g>
</mask>
<clipPath id="s">
<path d="m 0 0 h 1024 v 800 h -1024 z"/>
</clipPath>
<mask id="t">
<g filter="url(#a)">
<path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.4"/>
</g>
</mask>
<clipPath id="u">
<path d="m 0 0 h 1024 v 800 h -1024 z"/>
</clipPath>
<mask id="v">
<g filter="url(#a)">
<path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.4"/>
</g>
</mask>
<clipPath id="w">
<path d="m 0 0 h 1024 v 800 h -1024 z"/>
</clipPath>
<mask id="x">
<g filter="url(#a)">
<path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.5"/>
</g>
</mask>
<clipPath id="y">
<path d="m 0 0 h 1024 v 800 h -1024 z"/>
</clipPath>
<mask id="z">
<g filter="url(#a)">
<path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.5"/>
</g>
</mask>
<clipPath id="A">
<path d="m 0 0 h 1024 v 800 h -1024 z"/>
</clipPath>
<g clip-path="url(#c)" mask="url(#b)" transform="matrix(1 0 0 1 -56 -640)">
<path d="m 562.460938 212.058594 h 10.449218 c -1.183594 0.492187 -1.296875 2.460937 0 3 h -10.449218 z m 0 0" fill="#2e3436"/>
</g>
<g clip-path="url(#e)" mask="url(#d)" transform="matrix(1 0 0 1 -56 -640)">
<path d="m 16 632 h 1 v 1 h -1 z m 0 0" fill="#2e3436" fill-rule="evenodd"/>
</g>
<g clip-path="url(#g)" mask="url(#f)" transform="matrix(1 0 0 1 -56 -640)">
<path d="m 17 631 h 1 v 1 h -1 z m 0 0" fill="#2e3436" fill-rule="evenodd"/>
</g>
<g clip-path="url(#i)" mask="url(#h)" transform="matrix(1 0 0 1 -56 -640)">
<path d="m 18 634 h 1 v 1 h -1 z m 0 0" fill="#2e3436" fill-rule="evenodd"/>
</g>
<g clip-path="url(#k)" mask="url(#j)" transform="matrix(1 0 0 1 -56 -640)">
<path d="m 16 634 h 1 v 1 h -1 z m 0 0" fill="#2e3436" fill-rule="evenodd"/>
</g>
<g clip-path="url(#m)" mask="url(#l)" transform="matrix(1 0 0 1 -56 -640)">
<path d="m 17 635 h 1 v 1 h -1 z m 0 0" fill="#2e3436" fill-rule="evenodd"/>
</g>
<g clip-path="url(#o)" mask="url(#n)" transform="matrix(1 0 0 1 -56 -640)">
<path d="m 19 635 h 1 v 1 h -1 z m 0 0" fill="#2e3436" fill-rule="evenodd"/>
</g>
<path d="m 6 1 l -5 14 h 3 c 1.484375 -4 0.023438 0 1.507812 -4 h 4.984376 l 1.507812 4 h 3 l -5 -14 z m 2 3 l 2.023438 5 h -4 z m 0 0" fill="#2e3436"/>
<g clip-path="url(#q)" mask="url(#p)" transform="matrix(1 0 0 1 -56 -640)">
<path d="m 136 660 v 7 h 7 v -7 z m 0 0" fill="#2e3436"/>
</g>
<g clip-path="url(#s)" mask="url(#r)" transform="matrix(1 0 0 1 -56 -640)">
<path d="m 199 642 h 3 v 12 h -3 z m 0 0" fill="#2e3436"/>
</g>
<g clip-path="url(#u)" mask="url(#t)" transform="matrix(1 0 0 1 -56 -640)">
<path d="m 209.5 144.160156 c 0.277344 0 0.5 0.222656 0.5 0.5 v 1 c 0 0.277344 -0.222656 0.5 -0.5 0.5 s -0.5 -0.222656 -0.5 -0.5 v -1 c 0 -0.277344 0.222656 -0.5 0.5 -0.5 z m 0 0" fill="#2e3436"/>
</g>
<g clip-path="url(#w)" mask="url(#v)" transform="matrix(1 0 0 1 -56 -640)">
<path d="m 206.5 144.160156 c 0.277344 0 0.5 0.222656 0.5 0.5 v 1 c 0 0.277344 -0.222656 0.5 -0.5 0.5 s -0.5 -0.222656 -0.5 -0.5 v -1 c 0 -0.277344 0.222656 -0.5 0.5 -0.5 z m 0 0" fill="#2e3436"/>
</g>
<g clip-path="url(#y)" mask="url(#x)" transform="matrix(1 0 0 1 -56 -640)">
<path d="m 229.5 143.160156 c -0.546875 0 -1 0.457032 -1 1 c 0 0.546875 0.453125 1 1 1 s 1 -0.453125 1 -1 c 0 -0.542968 -0.453125 -1 -1 -1 z m 0 0" fill="#2e3436"/>
</g>
<g clip-path="url(#A)" mask="url(#z)" transform="matrix(1 0 0 1 -56 -640)">
<path d="m 226.453125 143.160156 c -0.519531 0 -0.953125 0.433594 -0.953125 0.953125 v 0.09375 c 0 0.519531 0.433594 0.953125 0.953125 0.953125 h 0.09375 c 0.519531 0 0.953125 -0.433594 0.953125 -0.953125 v -0.09375 c 0 -0.519531 -0.433594 -0.953125 -0.953125 -0.953125 z m 0 0" fill="#2e3436"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 6.1 KiB

2
wuffs-mirror-release-c

@ -1 +1 @@
Subproject commit c63c4a9348fb1b52a9b60a6eb62328a97d979d9e
Subproject commit 40ff91b31b3286aa92fd3cb4656975b275ef8b10