desktop: don't update notes field when executing command

User report: when switching focus between windows, the
cursor position gets lost. This is due to a note-edit
command being fired, which then overwrites the notes tab.

To prevent this, don't update the notes field when placing
a command. Moreover, generally don't update the dive
selection when placing a command as that also rewrites all
the values.

Should this be extended to other fields?

Fixes #3365

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

CHANGELOG.md

@@ -1,3 +1,4 @@
+- desktop: Don't lose cursor position in notes when switching between windows [#3369]
 - Uemis support: fix the ability disconnect/reconnect the Zurich when its filesystem is full
 - libdivecomputer: add support for latest BLE hardware in OSTC dive computers
 

commands/command_base.cpp

@@ -112,5 +112,3 @@ bool placingCommand()
 }
 
 } // namespace Command
-
-

commands/command_edit.cpp

@@ -156,6 +156,7 @@ void EditBase<T>::undo()
 	// Send signals.
 	DiveField id = fieldId();
 	emit diveListNotifier.divesChanged(stdToQt<dive *>(dives), id);
+	if (!placingCommand())
 		setSelection(selectedDives, current);
 }
 

desktop-widgets/tab-widgets/maintab.cpp

@@ -248,7 +248,7 @@ void MainTab::divesChanged(const QVector<dive *> &dives, DiveField field)
 		ui.depth->setText(get_depth_string(current_dive->maxdepth, true));
 	if (field.rating)
 		ui.rating->setCurrentStars(current_dive->rating);
-	if (field.notes)
+	if (field.notes && !Command::placingCommand())
 		updateNotes(current_dive);
 	if (field.datetime) {
 		updateDateTime(current_dive);
@@ -306,12 +306,11 @@ static bool isHtml(const QString &s)
 void MainTab::updateNotes(const struct dive *d)
 {
 	QString tmp(d->notes);
-	if (isHtml(tmp)) {
+	if (isHtml(tmp))
 		ui.notes->setHtml(tmp);
-	} else {
+	else
 		ui.notes->setPlainText(tmp);
 }
-}
 
 void MainTab::updateDateTime(const struct dive *d)
 {