Mercurial > hg > svgui
comparison view/View.cpp @ 678:26c5f7fd4807 imaf_enc
Merge from the default branch
author | Chris Cannam |
---|---|
date | Mon, 04 Nov 2013 17:12:32 +0000 |
parents | 0aea4b9e4c3d |
children | 1a0dfcbffaf1 |
comparison
equal
deleted
inserted
replaced
677:5e5ab4e8d64b | 678:26c5f7fd4807 |
---|---|
993 break; | 993 break; |
994 | 994 |
995 case PlaybackScrollPage: | 995 case PlaybackScrollPage: |
996 { | 996 { |
997 int xold = getXForFrame(oldPlayPointerFrame); | 997 int xold = getXForFrame(oldPlayPointerFrame); |
998 update(xold - 1, 0, 3, height()); | 998 update(xold - 4, 0, 9, height()); |
999 | 999 |
1000 long w = getEndFrame() - getStartFrame(); | 1000 long w = getEndFrame() - getStartFrame(); |
1001 w -= w/5; | 1001 w -= w/5; |
1002 long sf = (m_playPointerFrame / w) * w - w/8; | 1002 long sf = (m_playPointerFrame / w) * w - w/8; |
1003 | 1003 |
1032 long offset = getFrameForX(width()/2) - getStartFrame(); | 1032 long offset = getFrameForX(width()/2) - getStartFrame(); |
1033 long newCentre = sf + offset; | 1033 long newCentre = sf + offset; |
1034 bool changed = setCentreFrame(newCentre, false); | 1034 bool changed = setCentreFrame(newCentre, false); |
1035 if (changed) { | 1035 if (changed) { |
1036 xold = getXForFrame(oldPlayPointerFrame); | 1036 xold = getXForFrame(oldPlayPointerFrame); |
1037 update(xold - 1, 0, 3, height()); | 1037 update(xold - 4, 0, 9, height()); |
1038 } | 1038 } |
1039 } | 1039 } |
1040 } | 1040 } |
1041 | 1041 |
1042 update(xnew - 1, 0, 3, height()); | 1042 update(xnew - 4, 0, 9, height()); |
1043 | 1043 |
1044 break; | 1044 break; |
1045 } | 1045 } |
1046 | 1046 |
1047 case PlaybackIgnore: | 1047 case PlaybackIgnore: |