applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

keyboard: fix input row movement options

Browse source 
As described in #2565, the "Move Up" and "Move Down" popover menu options
are currently displayed for all input rows in the list, doing nothing if clicked
when a row is at the top or bottom of the list respectively. This commit adds
checks when creating and moving the input rows and disables these options at the
top and bottom of the list respectively, removing a useless menu option.

Fixes #2565
This commit is contained in:
Eric Daigle 2023-07-12 17:42:44 -07:00 • committed by Felipe Borges
parent a85bc780dc
commit 322830e3cc
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
panels/keyboard/cc-input-list-box.c
View file

@ -282,13 +282,19 @@ update_input_rows (CcInputListBox *self)
child;
child = gtk_widget_get_next_sibling (child)) {
CcInputRow *row;
gint row_idx;
if (!CC_IS_INPUT_ROW (child))
continue;
row = CC_INPUT_ROW (child);
row_idx = gtk_list_box_row_get_index (GTK_LIST_BOX_ROW (row));
cc_input_row_set_removable (row, n_input_rows > 1);
cc_input_row_set_draggable (row, n_input_rows > 1);
gtk_widget_action_set_enabled (GTK_WIDGET (row), "row.move-up", row_idx != 1);
gtk_widget_action_set_enabled (GTK_WIDGET (row), "row.move-down", GTK_LIST_BOX_ROW (gtk_widget_get_next_sibling (child)) != self->add_input_row);
}
}

9
panels/keyboard/cc-input-row.c
View file

@ -110,7 +110,11 @@ move_up_cb (GtkWidget *widget,
GtkListBoxRow *previous_row = gtk_list_box_get_row_at_index (list_box, previous_idx);
if (previous_row == NULL || !CC_IS_INPUT_ROW (previous_row))
{
gtk_widget_action_set_enabled (widget, "row.move-up", FALSE);
gtk_widget_action_set_enabled (GTK_WIDGET (gtk_list_box_get_row_at_index (list_box, 0)), "row.move-up", TRUE);
return;
}
g_signal_emit (self,
signals[SIGNAL_MOVE_ROW],
@ -129,7 +133,11 @@ move_down_cb (GtkWidget *widget,
GtkListBoxRow *next_row = gtk_list_box_get_row_at_index (list_box, next_idx);
if (next_row == NULL || !CC_IS_INPUT_ROW (next_row))
{
gtk_widget_action_set_enabled (widget, "row.move-down", FALSE);
gtk_widget_action_set_enabled (GTK_WIDGET (gtk_list_box_get_row_at_index (list_box, next_idx-1)), "row.move-down", TRUE);
return;
}
g_signal_emit (next_row,
signals[SIGNAL_MOVE_ROW],
@ -301,3 +309,4 @@ cc_input_row_set_draggable (CcInputRow *self,
gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (self->drag_source),
draggable ? GTK_PHASE_BUBBLE : GTK_PHASE_NONE);
}