[longomatch] Fix OS X keys handling
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Fix OS X keys handling
- Date: Sat, 22 Nov 2014 10:55:21 +0000 (UTC)
commit ed2c649c8068647e1035d23bd9263f17f3e1c2d2
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Fri Nov 21 14:07:20 2014 +0100
Fix OS X keys handling
LongoMatch.Drawing.Cairo/WidgetWrapper.cs | 2 +-
LongoMatch.GUI/Gui/TreeView/PlaysTreeView.cs | 27 ++++++++++++-------------
2 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/LongoMatch.Drawing.Cairo/WidgetWrapper.cs b/LongoMatch.Drawing.Cairo/WidgetWrapper.cs
index 136e7f4..f76ae82 100644
--- a/LongoMatch.Drawing.Cairo/WidgetWrapper.cs
+++ b/LongoMatch.Drawing.Cairo/WidgetWrapper.cs
@@ -248,7 +248,7 @@ namespace LongoMatch.Drawing.Cairo
switch (modifier) {
#if OSTYPE_OS_X
- case ModifierType.MetaMask:
+ case ModifierType.Mod2Mask:
bm = ButtonModifier.Control;
break;
case ModifierType.ControlMask:
diff --git a/LongoMatch.GUI/Gui/TreeView/PlaysTreeView.cs b/LongoMatch.GUI/Gui/TreeView/PlaysTreeView.cs
index 012931d..d653845 100644
--- a/LongoMatch.GUI/Gui/TreeView/PlaysTreeView.cs
+++ b/LongoMatch.GUI/Gui/TreeView/PlaysTreeView.cs
@@ -257,18 +257,6 @@ namespace LongoMatch.Gui.Component
{
TreePath[] paths = Selection.GetSelectedRows ();
- if ((evnt.Type == Gdk.EventType.ButtonPress) && (evnt.Button == 1)) {
- base.OnButtonPressEvent (evnt);
- paths = Selection.GetSelectedRows ();
- if (paths.Length == 1 && GetValueFromPath (paths [0]) is EventType) {
- dragging = true;
- dragStarted = false;
- startX = (int)evnt.X;
- startY = (int)evnt.Y;
- }
- return true;
- }
-
if (Misc.RightButtonClicked (evnt)) {
// We don't want to unselect the play when several
// plays are selected and we clik the right button
@@ -291,9 +279,20 @@ namespace LongoMatch.Gui.Component
} else if (paths.Length > 1) {
ShowMenu ();
}
- } else
+ return true;
+ } else if ((evnt.Type == Gdk.EventType.ButtonPress) && (evnt.Button == 1)) {
base.OnButtonPressEvent (evnt);
- return true;
+ paths = Selection.GetSelectedRows ();
+ if (paths.Length == 1 && GetValueFromPath (paths [0]) is EventType) {
+ dragging = true;
+ dragStarted = false;
+ startX = (int)evnt.X;
+ startY = (int)evnt.Y;
+ }
+ return true;
+ } else {
+ return base.OnButtonPressEvent (evnt);
+ }
}
protected override bool OnKeyPressEvent (Gdk.EventKey evnt)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]