Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Control Click fixes #29

Merged
merged 2 commits into from
Mar 30, 2015
Merged

Control Click fixes #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c84cf75
Fix control modifier on mac
Mar 25, 2015
14d88b7
Allows control click to actually do stuff, and doesn't toggle selecti…
Mar 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions vistrails/packages/spreadsheet/spreadsheet_window.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,8 +420,7 @@ def eventFilter(self,q,e):
if p and not p.isModal():
pos = p.viewport().mapFromGlobal(e.globalPos())
p.emit(QtCore.SIGNAL('cellActivated(int, int, bool)'),
p.rowAt(pos.y()), p.columnAt(pos.x()),
e.modifiers()==QtCore.Qt.ControlModifier)
p.rowAt(pos.y()), p.columnAt(pos.x()), False)
except AttributeError:
return False
return False
Expand Down
41 changes: 27 additions & 14 deletions vistrails/packages/vtk/vtkcell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,11 +511,14 @@ def mousePressEvent(self,e):
if (not self.iren) or (not self.iren.GetEnabled()):
return

ctrl = (e.modifiers()&QtCore.Qt.ControlModifier)

ctrl = bool(e.modifiers() & QtCore.Qt.ControlModifier)

isDoubleClick = e.type()==QtCore.QEvent.MouseButtonDblClick

self.iren.SetEventInformationFlipY(e.x(),e.y(),
ctrl,
(e.modifiers()&QtCore.Qt.ShiftModifier),
bool(e.modifiers()&QtCore.Qt.ShiftModifier),
chr(0),
isDoubleClick,
None)
Expand All @@ -527,7 +530,6 @@ def mousePressEvent(self,e):

if ctrl:
e.ignore()
return

self.interacting = self.getActiveRenderer(self.iren)

Expand All @@ -543,9 +545,12 @@ def mouseMoveEvent(self,e):
if (not self.iren) or (not self.iren.GetEnabled()):
return


ctrl = bool(e.modifiers() & QtCore.Qt.ControlModifier)

self.iren.SetEventInformationFlipY(e.x(),e.y(),
(e.modifiers()&QtCore.Qt.ControlModifier),
(e.modifiers()&QtCore.Qt.ShiftModifier),
ctrl,
bool(e.modifiers()&QtCore.Qt.ShiftModifier),
chr(0), 0, None)

self.iren.InvokeEvent("MouseMoveEvent")
Expand Down Expand Up @@ -581,9 +586,12 @@ def mouseReleaseEvent(self,e):
if (not self.iren) or (not self.iren.GetEnabled()):
return


ctrl = bool(e.modifiers() & QtCore.Qt.ControlModifier)

self.iren.SetEventInformationFlipY(e.x(),e.y(),
(e.modifiers()&QtCore.Qt.ControlModifier),
(e.modifiers()&QtCore.Qt.ShiftModifier),
ctrl,
bool(e.modifiers()&QtCore.Qt.ShiftModifier),
chr(0),0,None)

invoke = {QtCore.Qt.LeftButton:"LeftButtonReleaseEvent",
Expand Down Expand Up @@ -615,8 +623,10 @@ def keyPressEvent(self,e):
keysym = self.qt_key_to_key_sym(e.key())

# Ignore 'q' or 'e' or Ctrl-anykey
ctrl = (e.modifiers()&QtCore.Qt.ControlModifier)
shift = (e.modifiers()&QtCore.Qt.ShiftModifier)

ctrl = bool(e.modifiers() & QtCore.Qt.ControlModifier)

shift = bool(e.modifiers()&QtCore.Qt.ShiftModifier)
if (keysym in ['q', 'e'] or ctrl):
e.ignore()
return
Expand Down Expand Up @@ -649,8 +659,9 @@ def keyReleaseEvent(self,e):
keysym = self.qt_key_to_key_sym(e.key())

# Ignore 'q' or 'e' or Ctrl-anykey
ctrl = (e.modifiers()&QtCore.Qt.ControlModifier)
shift = (e.modifiers()&QtCore.Qt.ShiftModifier)

ctrl = bool(e.modifiers() & QtCore.Qt.ControlModifier)
shift = bool(e.modifiers()&QtCore.Qt.ShiftModifier)
if (keysym in ['q','e'] or ctrl):
e.ignore()
return
Expand All @@ -668,9 +679,10 @@ def wheelEvent(self,e):
if (not self.iren) or (not self.iren.GetEnabled()):
return

ctrl = bool(e.modifiers() & QtCore.Qt.ControlModifier)
self.iren.SetEventInformationFlipY(e.x(),e.y(),
(e.modifiers()&QtCore.Qt.ControlModifier),
(e.modifiers()&QtCore.Qt.ShiftModifier),
ctrl,
bool(e.modifiers()&QtCore.Qt.ShiftModifier),
chr(0),0,None)

self.SelectActiveRenderer(self.iren)
Expand Down Expand Up @@ -703,7 +715,8 @@ def contextMenuEvent(self,e):
if (not self.iren) or (not self.iren.GetEnabled()):
return

ctrl = int(e.modifiers()&QtCore.Qt.ControlModifier)
ctrl = int(e.modifiers() & QtCore.Qt.ControlModifier)

shift = int(e.modifiers()&QtCore.Qt.ShiftModifier)
self.iren.SetEventInformationFlipY(e.x(),e.y(),ctrl,shift,chr(0),0,None)
self.iren.InvokeEvent("ContextMenuEvent")
Expand Down