From e42f5322b88e4f8b9342e0f27563fe627e798cc8 Mon Sep 17 00:00:00 2001 From: Nikolaus Gullotta Date: Mon, 3 Jun 2019 14:01:35 -0500 Subject: [PATCH] fix dialog bug where right click -> rename could be longer than 48 characters and try some size changes --- gtk2_ardour/mixer_snapshot_dialog.cc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/mixer_snapshot_dialog.cc b/gtk2_ardour/mixer_snapshot_dialog.cc index 60b03d0884..f5985d76c9 100644 --- a/gtk2_ardour/mixer_snapshot_dialog.cc +++ b/gtk2_ardour/mixer_snapshot_dialog.cc @@ -224,7 +224,13 @@ void MixerSnapshotDialog::rename_snapshot(TreeModel::iterator& iter) if (new_label.length() > 0) { string new_path = Glib::build_filename(dir_name, new_label + ".xml"); ::g_rename(old_path.c_str(), new_path.c_str()); + + if (new_label.length() > 45) { + new_label = new_label.substr (0, 45); + new_label.append("..."); + } (*iter)[_columns.name] = new_label; + (*iter)[_columns.full_path] = new_path; } } } @@ -309,7 +315,7 @@ bool MixerSnapshotDialog::bootstrap_display_and_model(Gtkmm2ext::DnDTreeViewset_homogeneous(); vbox->pack_start(*add_remove); - vbox->set_size_request(800, -1); + vbox->set_size_request(1000, -1); btn_add->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this, &MixerSnapshotDialog::new_snapshot), global)); btn_new->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this, &MixerSnapshotDialog::new_snapshot_from_session), global)); @@ -320,7 +326,7 @@ bool MixerSnapshotDialog::bootstrap_display_and_model(Gtkmm2ext::DnDTreeViewset_size_request(-1, 400); - table->attach(scroller, 0, 3, 0, 5 ); + table->attach(scroller, 0, 3, 0, 5 ); table->attach(*vbox, 2, 3, 6, 8, FILL|EXPAND, FILL, 5, 5); top_level_view_box.pack_start(*table); @@ -374,8 +380,8 @@ void MixerSnapshotDialog::new_row(Glib::RefPtr model, MixerSnapshot* } } - if (name.length() > 48) { - name = name.substr (0, 48); + if (name.length() > 45) { + name = name.substr (0, 45); name.append("..."); }