34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
|
From 126a97d1f22f7d784d392b2b7d5aadf0a4e18c0d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Petter <petter@mykolab.ch>
|
||
|
|
Date: Thu, 27 Apr 2017 20:28:02 +0200
|
||
|
|
Subject: [PATCH] Avoid checking uninitialized member + simplify condition
|
||
|
|
|
||
|
|
---
|
||
|
|
qmltermwidget/lib/TerminalDisplay.cpp | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/qmltermwidget/lib/TerminalDisplay.cpp b/qmltermwidget/lib/TerminalDisplay.cpp
|
||
|
|
index 189a609..36d2cd2 100644
|
||
|
|
--- a/qmltermwidget/lib/TerminalDisplay.cpp
|
||
|
|
+++ b/qmltermwidget/lib/TerminalDisplay.cpp
|
||
|
|
@@ -325,6 +325,7 @@ TerminalDisplay::TerminalDisplay(QQuickItem *parent)
|
||
|
|
,_terminalSizeHint(false)
|
||
|
|
,_terminalSizeStartup(true)
|
||
|
|
,_bidiEnabled(false)
|
||
|
|
+,_mouseMarks(false)
|
||
|
|
,_actSel(0)
|
||
|
|
,_wordSelectionMode(false)
|
||
|
|
,_lineSelectionMode(false)
|
||
|
|
@@ -1846,7 +1847,7 @@ void TerminalDisplay::mousePressEvent(QMouseEvent* ev)
|
||
|
|
}
|
||
|
|
else if ( ev->button() == Qt::MidButton )
|
||
|
|
{
|
||
|
|
- if ( _mouseMarks || (!_mouseMarks && (ev->modifiers() & Qt::ShiftModifier)) )
|
||
|
|
+ if ( _mouseMarks || (ev->modifiers() & Qt::ShiftModifier) )
|
||
|
|
emitSelection(true,ev->modifiers() & Qt::ControlModifier);
|
||
|
|
else
|
||
|
|
emit mouseSignal( 1, charColumn +1, charLine +1 +_scrollBar->value() -_scrollBar->maximum() , 0);
|
||
|
|
--
|
||
|
|
2.12.2
|
||
|
|
|