Changeset View
Changeset View
Standalone View
Standalone View
src/difftextwindow.cpp
Show First 20 Lines • Show All 386 Lines • ▼ Show 20 Line(s) | 383 | { | |||
---|---|---|---|---|---|
387 | { | 387 | { | ||
388 | int newFirstLine = getBestFirstLine( | 388 | int newFirstLine = getBestFirstLine( | ||
389 | convertDiff3LineIdxToLine(d->m_fastSelectorLine1), | 389 | convertDiff3LineIdxToLine(d->m_fastSelectorLine1), | ||
390 | convertDiff3LineIdxToLine(d->m_fastSelectorLine1 + d->m_fastSelectorNofLines) - convertDiff3LineIdxToLine(d->m_fastSelectorLine1), | 390 | convertDiff3LineIdxToLine(d->m_fastSelectorLine1 + d->m_fastSelectorNofLines) - convertDiff3LineIdxToLine(d->m_fastSelectorLine1), | ||
391 | d->m_firstLine, | 391 | d->m_firstLine, | ||
392 | getNofVisibleLines()); | 392 | getNofVisibleLines()); | ||
393 | if(newFirstLine != d->m_firstLine) | 393 | if(newFirstLine != d->m_firstLine) | ||
394 | { | 394 | { | ||
395 | scroll(0, newFirstLine - d->m_firstLine); | 395 | emit scrollDiffTextWindow(0, newFirstLine - d->m_firstLine); | ||
396 | } | 396 | } | ||
397 | 397 | | |||
398 | update(); | 398 | update(); | ||
399 | } | 399 | } | ||
400 | } | 400 | } | ||
401 | 401 | | |||
402 | void DiffTextWindow::showStatusLine(int line) | 402 | void DiffTextWindow::showStatusLine(int line) | ||
403 | { | 403 | { | ||
▲ Show 20 Lines • Show All 175 Lines • ▼ Show 20 Line(s) | 577 | { | |||
579 | if(e->x() < fontWidth) deltaX = -1 - abs(e->x() - fontWidth) / fontWidth; | 579 | if(e->x() < fontWidth) deltaX = -1 - abs(e->x() - fontWidth) / fontWidth; | ||
580 | } | 580 | } | ||
581 | if(e->y() < 0) deltaY = -1 - sqr(e->y()) / sqr(fm.lineSpacing()); | 581 | if(e->y() < 0) deltaY = -1 - sqr(e->y()) / sqr(fm.lineSpacing()); | ||
582 | if(e->y() > height()) deltaY = +1 + sqr(e->y() - height()) / sqr(fm.lineSpacing()); | 582 | if(e->y() > height()) deltaY = +1 + sqr(e->y() - height()) / sqr(fm.lineSpacing()); | ||
583 | if((deltaX != 0 && d->m_scrollDeltaX != deltaX) || (deltaY != 0 && d->m_scrollDeltaY != deltaY)) | 583 | if((deltaX != 0 && d->m_scrollDeltaX != deltaX) || (deltaY != 0 && d->m_scrollDeltaY != deltaY)) | ||
584 | { | 584 | { | ||
585 | d->m_scrollDeltaX = deltaX; | 585 | d->m_scrollDeltaX = deltaX; | ||
586 | d->m_scrollDeltaY = deltaY; | 586 | d->m_scrollDeltaY = deltaY; | ||
587 | scroll(deltaX, deltaY); | 587 | emit scrollDiffTextWindow(deltaX, deltaY); | ||
588 | if(d->m_delayedDrawTimer) | 588 | if(d->m_delayedDrawTimer) | ||
589 | killTimer(d->m_delayedDrawTimer); | 589 | killTimer(d->m_delayedDrawTimer); | ||
590 | d->m_delayedDrawTimer = startTimer(50); | 590 | d->m_delayedDrawTimer = startTimer(50); | ||
591 | } | 591 | } | ||
592 | else | 592 | else | ||
593 | { | 593 | { | ||
594 | d->m_scrollDeltaX = deltaX; | 594 | d->m_scrollDeltaX = deltaX; | ||
595 | d->m_scrollDeltaY = deltaY; | 595 | d->m_scrollDeltaY = deltaY; | ||
▲ Show 20 Lines • Show All 44 Lines • ▼ Show 20 Line(s) | 615 | { | |||
640 | } | 640 | } | ||
641 | 641 | | |||
642 | d->m_bMyUpdate = false; | 642 | d->m_bMyUpdate = false; | ||
643 | } | 643 | } | ||
644 | 644 | | |||
645 | if(d->m_scrollDeltaX != 0 || d->m_scrollDeltaY != 0) | 645 | if(d->m_scrollDeltaX != 0 || d->m_scrollDeltaY != 0) | ||
646 | { | 646 | { | ||
647 | d->m_selection.end(d->m_selection.getLastLine() + d->m_scrollDeltaY, d->m_selection.getLastPos() + d->m_scrollDeltaX); | 647 | d->m_selection.end(d->m_selection.getLastLine() + d->m_scrollDeltaY, d->m_selection.getLastPos() + d->m_scrollDeltaX); | ||
648 | scroll(d->m_scrollDeltaX, d->m_scrollDeltaY); | 648 | emit scrollDiffTextWindow(d->m_scrollDeltaX, d->m_scrollDeltaY); | ||
649 | killTimer(d->m_delayedDrawTimer); | 649 | killTimer(d->m_delayedDrawTimer); | ||
650 | d->m_delayedDrawTimer = startTimer(50); | 650 | d->m_delayedDrawTimer = startTimer(50); | ||
651 | } | 651 | } | ||
652 | } | 652 | } | ||
653 | 653 | | |||
654 | void DiffTextWindow::resetSelection() | 654 | void DiffTextWindow::resetSelection() | ||
655 | { | 655 | { | ||
656 | d->m_selection.reset(); | 656 | d->m_selection.reset(); | ||
▲ Show 20 Lines • Show All 1429 Lines • Show Last 20 Lines |