Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 27e0e5f4a047
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b430de2e709f
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 9, 2020

  1. Copy the full SHA
    b430de2 View commit details
Showing with 20 additions and 3 deletions.
  1. +1 −1 doc
  2. +19 −2 src/glscopeclient/WaveformArea_events.cpp
2 changes: 1 addition & 1 deletion doc
Submodule doc updated 1 files
+7 −0 section-waveformviews.tex
21 changes: 19 additions & 2 deletions src/glscopeclient/WaveformArea_events.cpp
Original file line number Diff line number Diff line change
@@ -123,11 +123,28 @@ bool WaveformArea::on_scroll_event (GdkEventScroll* ev)
{
case GDK_SCROLL_UP:
if(!IsEyeOrBathtub())
m_parent->OnZoomInHorizontal(m_group, XPositionToXAxisUnits(ev->x));
{
if(ev->state & GDK_SHIFT_MASK)
{
m_group->m_xAxisOffset -= 50.0 / m_group->m_pixelsPerXUnit;
m_group->GetParent()->ClearPersistence(m_group, false, true);
}

else
m_parent->OnZoomInHorizontal(m_group, XPositionToXAxisUnits(ev->x));
}
break;
case GDK_SCROLL_DOWN:
if(!IsEyeOrBathtub())
m_parent->OnZoomOutHorizontal(m_group, XPositionToXAxisUnits(ev->x));
{
if(ev->state & GDK_SHIFT_MASK)
{
m_group->m_xAxisOffset += 50.0 / m_group->m_pixelsPerXUnit;
m_group->GetParent()->ClearPersistence(m_group, false, true);
}
else
m_parent->OnZoomOutHorizontal(m_group, XPositionToXAxisUnits(ev->x));
}
break;
case GDK_SCROLL_LEFT:
LogDebug("scroll left\n");