From b46852eaec7f566fa5f2c133f1677c92dd4aa9f7 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 25 Sep 2017 13:08:06 +0200 Subject: [PATCH] bouqueteditor_bouquets: RC_yellow now stops move bouquets too Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/bba488cee8b690bbf3b7aad8a49a20b177e50c88 Author: vanhofen Date: 2017-09-25 (Mon, 25 Sep 2017) Origin message was: ------------------ - bouqueteditor_bouquets: RC_yellow now stops move bouquets too --- src/gui/bedit/bouqueteditor_bouquets.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp index 3c0faa388..b59d8f92c 100644 --- a/src/gui/bedit/bouqueteditor_bouquets.cpp +++ b/src/gui/bedit/bouqueteditor_bouquets.cpp @@ -304,6 +304,8 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* liststart = (selected/items_count)*items_count; if (state == beDefault) beginMoveBouquet(); + else if (state == beMoving) + finishMoveBouquet(); paintItem(selected - liststart); } } @@ -312,7 +314,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* if (selected < Bouquets->size()) /* Bouquets->size() might be 0 */ { if (state == beDefault) - renameBouquet(); + renameBouquet(); } } else if (msg == CRCInput::RC_pause) @@ -320,7 +322,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* if (selected < Bouquets->size()) /* Bouquets->size() might be 0 */ { if (state == beDefault) - switchHideBouquet(); + switchHideBouquet(); } } else if (msg == CRCInput::RC_stop) @@ -328,7 +330,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* if (selected < Bouquets->size()) /* Bouquets->size() might be 0 */ { if (state == beDefault) - switchLockBouquet(); + switchLockBouquet(); } } else if (msg == CRCInput::RC_ok)