チェンジセット 1740

コミット日時:

2008/10/28 22:50:43 (5 年前)

コミッタ:

tasuku

ログメッセージ:

fixed bug in dotButton and Ctrl shortcut

ファイル:

• as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint.as (更新) (1 diff)
• as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/controls/PenDetailControlScript.as (更新) (1 diff)
• as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/entities/GPLogger.as (更新) (3 diffs)

as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint.as

@@ -382 +382 @@
-  switch (evt.keyCode) {
-  case Keyboard.CONTROL:
-setTool(GPPen.PEN_MODE_DROPPER, null, false
+resetPenTool(
-    break;
-  case Keyboard.SPACE:
-setTool(GPPen.PEN_MODE_HANDTOOL, null, false
+resetPenTool(
-    break;
-  return;

as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/controls/PenDetailControlScript.as

@@ -113 +113 @@
-    gridItemPalette.setStyle('backgroundColor', color);
-    PopUpManager.removePopUp(IFlexDisplayObject(evt.target));
+  }
+}
+
+// Ctrlとかのショートカットキーで変わったペンToolを戻す
+public function resetPenTool():void {
+  if (dropperButton.selected) {
+    setTool(GPPen.PEN_MODE_DROPPER, null, true);
+  } else if (handtoolButton.selected) {
+    setTool(GPPen.PEN_MODE_HANDTOOL, null, true);
+  } else if (dotButton.selected) {
+    setTool(GPPen.PEN_MODE_PIXEL, null, true);
+  } else {
+    _logger.eventSetPenMode(uint(penModeComboBox.value));
-  }
-}

as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/entities/GPLogger.as

@@ -1021 +1021 @@
-        // logging
-      }
-
-
-
-
-
+
-        switch (mode) {
-        case GPPen.PEN_MODE_DROPPER:
@@ -1038 +1034 @@
-          break;
-        case GPPen.PEN_MODE_PIXEL:
+          _canvas.setCursor(null);
-          break;
-        default:
@@ -1046 +1043 @@
-        }        
-      }
+      _pen.mode = mode;
+
+      invokePenChange();
-    }
-