Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Thu, 06 Feb 2025 21:17:41 UTC Commit: 645e9c6a2526757e164aebce792f2f5a5af1331d https://github.com/geany/geany/commit/645e9c6a2526757e164aebce792f2f5a5af133...
Log Message: ----------- Merge pull request #4226 from b4n/kb-change-kaboom
Fixes keybinding editing after bloopers from #4192.
Modified Paths: -------------- src/prefs.c
Modified: src/prefs.c 14 lines changed, 10 insertions(+), 4 deletions(-) =================================================================== @@ -203,9 +203,11 @@ static void kb_tree_view_change_button_clicked_cb(GtkWidget *button, KbData *kbd gtk_widget_show_all(dialog); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { + GtkTreeIter child_iter; const gchar *new_text = gtk_label_get_text(GTK_LABEL(accel_label));
- kb_change_iter_shortcut(kbdata, &iter, new_text); + gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(model), &child_iter, &iter); + kb_change_iter_shortcut(kbdata, &child_iter, new_text); } gtk_widget_destroy(dialog);
@@ -1404,13 +1406,17 @@ static void kb_cell_edited_cb(GtkCellRendererText *cellrenderertext, { if (path != NULL && new_text != NULL) { + GtkTreeModel *filter_model = gtk_tree_view_get_model(kbdata->tree); GtkTreeIter iter; + GtkTreeIter child_iter;
- gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(kbdata->store), &iter, path); - if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(kbdata->store), &iter)) + gtk_tree_model_get_iter_from_string(filter_model, &iter, path); + if (gtk_tree_model_iter_has_child(filter_model, &iter)) return; /* ignore group items */
- kb_change_iter_shortcut(kbdata, &iter, new_text); + gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(filter_model), + &child_iter, &iter); + kb_change_iter_shortcut(kbdata, &child_iter, new_text); } }
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).