Skip to content

Commit

Permalink
WaveformArea: don't try to drag Y axis if already dragging trigger ar…
Browse files Browse the repository at this point in the history
…row. Fixes #616.
  • Loading branch information
azonenberg committed Sep 30, 2023
1 parent c7f57d6 commit 6d69f86
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/ngscopeclient/WaveformArea.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2183,7 +2183,7 @@ void WaveformArea::RenderYAxis(ImVec2 size, map<float, float>& gridmap, float vb
if(aestream && (aestream.GetType() == Stream::STREAM_TYPE_EYE))
canDragYAxis = false;

if(ImGui::IsItemHovered() && !m_mouseOverTriggerArrow && canDragYAxis)
if(ImGui::IsItemHovered() && !m_mouseOverTriggerArrow && canDragYAxis && (m_dragState == DRAG_STATE_NONE))
{
//Start dragging
if(ImGui::IsMouseClicked(ImGuiMouseButton_Left))
Expand Down

0 comments on commit 6d69f86

Please sign in to comment.