diff options
author | Carlos Soriano <csoriano@redhat.com> | 2018-07-25 16:20:06 +0200 |
---|---|---|
committer | Carlos Soriano <csoriano@redhat.com> | 2018-07-25 23:03:33 +0200 |
commit | 8742c4112d0f48d5ec2036388cd40e22d18157e1 (patch) | |
tree | c15a8b0431821041645b493d6ea797962a334bc3 | |
parent | 3c52b832a6517eec595389e20c62962f750f3711 (diff) | |
download | nautilus-8742c4112d0f48d5ec2036388cd40e22d18157e1.tar.gz |
view-icon: Fix and improve visuals
There were few visual inconsistencies due to either code typos or
lack of a bit of design.
-rw-r--r-- | src/nautilus-view-icon-item-ui.c | 19 | ||||
-rw-r--r-- | src/resources/css/Adwaita.css | 25 |
2 files changed, 34 insertions, 10 deletions
diff --git a/src/nautilus-view-icon-item-ui.c b/src/nautilus-view-icon-item-ui.c index bd97ed3b4..4d0bb81cb 100644 --- a/src/nautilus-view-icon-item-ui.c +++ b/src/nautilus-view-icon-item-ui.c @@ -59,7 +59,7 @@ create_icon (NautilusViewIconItemUi *self) nautilus_file_should_show_thumbnail (file)) { style_context = gtk_widget_get_style_context (GTK_WIDGET (fixed_height_box)); - gtk_style_context_add_class (style_context, "icon-item-background"); + gtk_style_context_add_class (style_context, "icon-background"); } gtk_box_pack_start (fixed_height_box, GTK_WIDGET (icon), FALSE, FALSE, 0); @@ -126,6 +126,7 @@ constructed (GObject *object) { NautilusViewIconItemUi *self = NAUTILUS_VIEW_ICON_ITEM_UI (object); GtkBox *container; + GtkBox *item_selection_background; GtkLabel *label; GtkStyleContext *style_context; NautilusFile *file; @@ -136,8 +137,13 @@ constructed (GObject *object) file = nautilus_view_item_model_get_file (self->model); icon_size = nautilus_view_item_model_get_icon_size (self->model); container = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 0)); + /* This container is for having a constant selection background, instead of + * the dinamically sized one of the GtkFlowBox + */ + item_selection_background = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 0)); + gtk_widget_set_halign (GTK_WIDGET (item_selection_background), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (item_selection_background), GTK_ALIGN_START); self->item_container = nautilus_container_max_width_new (); - self->icon = create_icon (self); gtk_box_pack_start (container, GTK_WIDGET (self->icon), FALSE, FALSE, 0); @@ -151,7 +157,7 @@ constructed (GObject *object) gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_START); gtk_box_pack_end (container, GTK_WIDGET (label), TRUE, TRUE, 0); - style_context = gtk_widget_get_style_context (GTK_WIDGET (container)); + style_context = gtk_widget_get_style_context (GTK_WIDGET (item_selection_background)); gtk_style_context_add_class (style_context, "icon-item-background"); gtk_widget_set_valign (GTK_WIDGET (container), GTK_ALIGN_START); @@ -162,8 +168,11 @@ constructed (GObject *object) nautilus_container_max_width_set_max_width (NAUTILUS_CONTAINER_MAX_WIDTH (self->item_container), icon_size); - gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (self->item_container)); - gtk_widget_show_all (GTK_WIDGET (self->item_container)); + gtk_container_add (GTK_CONTAINER (item_selection_background), + GTK_WIDGET (self->item_container)); + gtk_container_add (GTK_CONTAINER (self), + GTK_WIDGET (item_selection_background)); + gtk_widget_show_all (GTK_WIDGET (self)); g_signal_connect (self->model, "notify::icon-size", (GCallback) on_view_item_size_changed, self); diff --git a/src/resources/css/Adwaita.css b/src/resources/css/Adwaita.css index 4276533db..d9fb9ed01 100644 --- a/src/resources/css/Adwaita.css +++ b/src/resources/css/Adwaita.css @@ -195,11 +195,26 @@ entry.search > * { } /* Icon view */ -flowboxchild:selected{background-color:transparent;} +flowboxchild:selected { + background-color:transparent; +} -flowboxchild > widget > box > .icon-background {background-color:black; border-color:#4a90d9; border-style:solid; border-width:0px;} -flowboxchild:selected > widget > box > .icon-background {background-color:black; border-color:#4a90d9; border-style:solid; border-width:0px;} +.icon-background { + background-color:black; + border-color:#4a90d9; + border-style:solid; + border-width:0px; +} -flowboxchild > widget > .icon-item-background {padding:4px;} -flowboxchild:selected > widget > .icon-item-background {padding:4px; background-color:#4a90d9; border-color:#4a90d9; border-style:solid; border-width:0px; border-radius:4px 4px 4px 4px;} +flowboxchild > .icon-item-background { + padding:4px; +} +flowboxchild:selected > .icon-item-background { + padding:4px; + background-color:#4a90d9; + border-color:#4a90d9; + border-style:solid; + border-width:0px; + border-radius:4px 4px 4px 4px; +} |