Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-16 08:34:12 +02:00
Code Issues Projects Releases Wiki Activity

2021-03-18 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed bugs with enabling correct choices in the right-click menu
	in 'RDMarkerView'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-03-18 19:54:45 -04:00
parent 39fb00801f
commit 0cad68198d
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -21279,3 +21279,6 @@
2021-03-18 Fred Gleason <fredg@paravelsystems.com> 2021-03-18 Fred Gleason <fredg@paravelsystems.com>
* Fixed bugs with ensuring consistent position interlocks between * Fixed bugs with ensuring consistent position interlocks between
markers in 'RDMarkerView'. markers in 'RDMarkerView'.
2021-03-18 Fred Gleason <fredg@paravelsystems.com>
* Fixed bugs with enabling correct choices in the right-click menu
in 'RDMarkerView'.

16
lib/rdmarkerview.cpp
View File

@ -392,6 +392,8 @@ bool RDMarkerView::hasUnsavedChanges() const
void RDMarkerView::processRightClick(RDMarkerHandle::PointerRole role, void RDMarkerView::processRightClick(RDMarkerHandle::PointerRole role,
const QPointF &pos) const QPointF &pos)
{ {
d_deleting_roles.clear();
d_deleting_roles.push_back(role); d_deleting_roles.push_back(role);
if((role==RDMarkerHandle::SegueStart)|| if((role==RDMarkerHandle::SegueStart)||
(role==RDMarkerHandle::TalkStart)|| (role==RDMarkerHandle::TalkStart)||
@ -515,21 +517,23 @@ void RDMarkerView::clear()
void RDMarkerView::updateMenuData() void RDMarkerView::updateMenuData()
{ {
bool can_add= bool can_add=
(d_deleting_roles.size()==0)&&
(Msec(d_mouse_pos)>=d_pointers[RDMarkerHandle::CutStart])&& (Msec(d_mouse_pos)>=d_pointers[RDMarkerHandle::CutStart])&&
(Msec(d_mouse_pos)<d_pointers[RDMarkerHandle::CutEnd]); (Msec(d_mouse_pos)<d_pointers[RDMarkerHandle::CutEnd]);
bool can_delete= bool can_delete=
d_marker_menu_used&& d_marker_menu_used&&
(!d_deleting_roles.contains(RDMarkerHandle::CutStart))&& (!d_deleting_roles.contains(RDMarkerHandle::CutStart))&&
(!d_deleting_roles.contains(RDMarkerHandle::CutEnd)); (!d_deleting_roles.contains(RDMarkerHandle::CutEnd));
if(can_delete) {
can_add=false;
}
d_delete_marker_action->setEnabled(can_delete); d_delete_marker_action->setEnabled(can_delete);
d_add_fadedown_action-> d_add_fadedown_action->
setEnabled(can_add&&(d_pointers[RDMarkerHandle::FadeDown]<0)); setEnabled(can_add&&(d_pointers[RDMarkerHandle::FadeDown]<0)&&
((d_pointers[RDMarkerHandle::FadeUp]<0)||
(d_pointers[RDMarkerHandle::FadeUp]<Msec(d_mouse_pos))));
d_add_fadeup_action-> d_add_fadeup_action->
setEnabled(can_add&&(d_pointers[RDMarkerHandle::FadeUp]<0)); setEnabled(can_add&&(d_pointers[RDMarkerHandle::FadeUp]<0)&&
((d_pointers[RDMarkerHandle::FadeDown]<0)||
(d_pointers[RDMarkerHandle::FadeDown]>Msec(d_mouse_pos))));
d_add_hook_action-> d_add_hook_action->
setEnabled(can_add&&(d_pointers[RDMarkerHandle::HookStart]<0)); setEnabled(can_add&&(d_pointers[RDMarkerHandle::HookStart]<0));
d_add_segue_action-> d_add_segue_action->
@ -760,6 +764,8 @@ void RDMarkerView::mousePressEvent(QMouseEvent *e)
d_marker_menu_used=false; d_marker_menu_used=false;
return; return;
} }
d_deleting_roles.clear();
d_main_menu->setGeometry(e->globalX(),e->globalY(), d_main_menu->setGeometry(e->globalX(),e->globalY(),
d_main_menu->sizeHint().width(), d_main_menu->sizeHint().width(),
d_main_menu->sizeHint().height()); d_main_menu->sizeHint().height());