[Gridarta-commit] SF.net SVN: gridarta: [1240] trunk/crossfire

[<aki...@us...>]

Revision: 1240
          http://svn.sourceforge.net/gridarta/?rev=1240&view=rev
Author:   akirschbaum
Date:     2006-12-23 14:15:32 -0800 (Sat, 23 Dec 2006)

Log Message:
-----------
Remove support for deleting/inserting with button 1 and shift/control.

Modified Paths:
--------------
    trunk/crossfire/ChangeLog
    trunk/crossfire/src/cfeditor/CMapViewBasic.java
    trunk/crossfire/src/cfeditor/gui/maptilelist/MapTileListControl.java

Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog	2006-12-23 22:10:54 UTC (rev 1239)
+++ trunk/crossfire/ChangeLog	2006-12-23 22:15:32 UTC (rev 1240)
@@ -1,5 +1,8 @@
 2006-12-23  Andreas Kirschbaum
 
+	* Remove support for deleting/inserting with button 1 and
+	shift/control.
+
 	* Do not delete more than one object per tile when dragging the
 	mouse.
 

Modified: trunk/crossfire/src/cfeditor/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-12-23 22:10:54 UTC (rev 1239)
+++ trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-12-23 22:15:32 UTC (rev 1240)
@@ -367,7 +367,7 @@
 
             if (mapLoc != null) {
                 // in "locked pickmaps" mode, pickmaps react only to leftclicks
-                if (mapControl.isPickmap() && mainControl.isLockAllPickmaps() && !(e.getModifiers() == InputEvent.BUTTON1_MASK && !e.isShiftDown() && !e.isControlDown())) {
+                if (mapControl.isPickmap() && mainControl.isLockAllPickmaps() && (e.getModifiers() & InputEvent.BUTTON1_MASK) == 0) {
                     return;
                 }
 

Modified: trunk/crossfire/src/cfeditor/gui/maptilelist/MapTileListControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/maptilelist/MapTileListControl.java	2006-12-23 22:10:54 UTC (rev 1239)
+++ trunk/crossfire/src/cfeditor/gui/maptilelist/MapTileListControl.java	2006-12-23 22:15:32 UTC (rev 1240)
@@ -112,7 +112,7 @@
     MouseListener getMouseListener() {
         return new MouseAdapter() {
             @Override public void mousePressed(final MouseEvent e) {
-                if (e.getModifiers() == InputEvent.BUTTON1_MASK && !e.isShiftDown() && !e.isControlDown()) {
+                if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0) {
                     // --- left mouse button: select arch ---
                     // first, check if this is a doubleclick
                     final long thisClick = (new Date()).getTime();
@@ -127,7 +127,7 @@
                     // save values for next click
                     lastClick = thisClick;
                     lastClickGameObject = getMapTileSelection();
-                } else if ((e.getModifiers() & InputEvent.BUTTON3_MASK) != 0 || ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0 && e.isShiftDown())) {
+                } else if ((e.getModifiers() & InputEvent.BUTTON3_MASK) != 0) {
                     // --- right mouse button: insert arch ---
 		    insertGameObjectFromArchPanel(view.getListIndex(e));
                 } else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.