← Back to branch summary

~renatofilho/ubuntu-terminal-app/ssh-mode

« back to all changes in this revision

Viewing changes to src/plugin/qmltermwidget/lib/TerminalDisplay.cpp

  • Committer: Tarmac
  • Author(s): Stefano Verzegnassi
  • Date: 2016-04-23 12:24:40 UTC
  • mfrom: (191.2.2 fix-1488588)
  • Revision ID: tarmac-20160423122440-2n9veym2ksf5dzw4
* Expose drag mode settings to QML
* Disabled drag support in ubuntu-terminal-app in order to workaround the missing support in Mir. Fixes: https://bugs.launchpad.net/bugs/1488588.

Approved by Jenkins Bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugin/qmltermwidget/lib/TerminalDisplay.cpp
329
329
,_cursorBlinking(false)
330
330
,_hasBlinkingCursor(false)
331
331
,_allowBlinkingText(true)
332
 
,_ctrlDrag(false)
 
332
,_dragMode(CtrlModifierDrag)
333
333
,_tripleClickMode(SelectWholeLine)
334
334
,_isFixedSize(false)
335
335
,_possibleTripleClick(false)
1804
1804
    
1805
1805
    selected =  _screenWindow->isSelected(pos.x(),pos.y());
1806
1806
 
1807
 
    if ((!_ctrlDrag || ev->modifiers() & Qt::ControlModifier) && selected ) {
 
1807
    if (((_dragMode == DragMode::CtrlModifierDrag && ev->modifiers() & Qt::ControlModifier) ||
 
1808
         _dragMode == DragMode::NoModifierDrag) && selected ) {
1808
1809
      // The user clicked inside selected text
1809
1810
      dragInfo.state = diPending;
1810
1811
      dragInfo.start = ev->pos();