Skip to content

nemo-icon-container.c: Keep icon-view rename open across scrollbar allocations #3851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rolanddeboer wants to merge 1 commit into from
Closed

nemo-icon-container.c: Keep icon-view rename open across scrollbar allocations #3851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 27 additions & 11 deletions libnemo-private/nemo-icon-container.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2848,13 +2848,20 @@ size_allocate (GtkWidget *widget,
need_layout_redone = FALSE;
}

if (is_renaming (container)) {
container->details->renaming_allocation_count++;

if (container->details->renaming_allocation_count == 1) {
need_layout_redone = FALSE;
}
}
/* Scrollbar show/hide at the fit threshold allocates this view at
* two widths. Entering rename mode hits that once; the 2018
* workaround skipped only the first allocation. Each keystroke
* changes the editable label's requisition and repeats the pair.
* A later allocation still relayouts, icon_set_position() sees the
* icon move, and the rename is committed. Every key acts like Enter.
* Skip relayout for the whole session and apply it once rename ends.
*/
if (is_renaming (container)) {
if (need_layout_redone) {
container->details->relayout_deferred_during_rename = TRUE;
}
need_layout_redone = FALSE;
}

GTK_WIDGET_CLASS (nemo_icon_container_parent_class)->size_allocate (widget, allocation);

Expand Down Expand Up @@ -4996,7 +5003,7 @@ nemo_icon_container_init (NemoIconContainer *container)
details->skip_rename_on_release = FALSE;
details->dnd_grid = NULL;
details->current_selection_count = -1;
details->renaming_allocation_count = 0;
details->relayout_deferred_during_rename = FALSE;

details->update_visible_icons_id = 0;
details->ok_to_load_deferred_attrs = FALSE;
Expand Down Expand Up @@ -7072,7 +7079,7 @@ nemo_icon_container_start_renaming_selected_item (NemoIconContainer *container,

nemo_icon_container_update_icon (container, icon);

details->renaming_allocation_count = 0;
details->relayout_deferred_during_rename = FALSE;

/* We are in renaming mode */
details->renaming = TRUE;
Expand Down Expand Up @@ -7101,20 +7108,25 @@ nemo_icon_container_end_renaming_mode (NemoIconContainer *container, gboolean co
{
NemoIcon *icon;
const char *changed_text = NULL;
gboolean relayout_deferred;

relayout_deferred = container->details->relayout_deferred_during_rename;
container->details->relayout_deferred_during_rename = FALSE;

set_pending_icon_to_rename (container, NULL);

icon = nemo_icon_container_get_icon_being_renamed (container);
if (icon == NULL) {
if (relayout_deferred) {
schedule_redo_layout (container);
}
return;
}

/* We are not in renaming mode */
container->details->renaming = FALSE;
nemo_icon_canvas_item_set_renaming (icon->item, FALSE);

container->details->renaming_allocation_count = 0;

if (commit) {
set_pending_icon_to_reveal (container, icon);
}
Expand All @@ -7138,6 +7150,10 @@ nemo_icon_container_end_renaming_mode (NemoIconContainer *container, gboolean co
g_free (container->details->original_text);

nemo_icon_container_unfreeze_updates (container);

if (relayout_deferred) {
schedule_redo_layout (container);
}
}

void
Expand Down
6 changes: 5 additions & 1 deletion libnemo-private/nemo-icon-private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,11 @@ struct NemoIconContainerDetails {

int size_allocation_count;
guint size_allocation_count_id;
int renaming_allocation_count;

/* A size_allocate during rename needed a relayout. Icon positions
* are left alone until renaming ends, so scrollbar show/hide does
* not commit the rename. */
gboolean relayout_deferred_during_rename;

/* Is the container fixed or resizable */
gboolean is_fixed_size;
Expand Down