チェンジセット 1108

差分発生行の前後
無視リスト:
コミット日時:
2008/08/27 18:17:16 (5 年前)
コミッタ:
tasuku
ログメッセージ:

r59@poppop (orig r58): tasuku | 2008-06-01 02:05:51 +0900

ファイル:

凡例:

変更無し
追加
削除
更新
コピー
移動

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

    r1104 r1108  
    66import gunyarapaint.Canvas; 
    77import gunyarapaint.Com; 
     8import gunyarapaint.controls.PenDetailControl; 
     9import gunyarapaint.controls.PenDetailWindowControl; 
    810 
    911import mx.controls.Alert; 
    …… 
    1113import mx.events.NumericStepperEvent; 
    1214import mx.events.SliderEvent; 
     15import mx.managers.PopUpManager; 
    1316 
    1417private var gpCanvas:gunyarapaint.Canvas; 
    …… 
    8992   
    9093  // ペン詳細 
    91   penDetail.addEventListener('changePen', changePenHandler); 
     94  PopUpManager.addPopUp(penDetailWindow, this); 
     95  penDetailWindow.penDetail.addEventListener('changePen', changePenHandler); 
    9296   
    9397  // 回転のときに勝手にApplicationの領域が拡大しないように 
    …… 
    268272 
    269273private function changePenHandler(evt:Event):void { 
    270   gpCanvas.pen = penDetail.pen;  
    271 } 
     274  gpCanvas.pen = penDetailWindow.pen;  
     275} 

  • as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint.mxml

    r1104 r1108  
    3030  <mx:Canvas id="canvas" width="400" height="300" x="255" y="288"> 
    3131  </mx:Canvas> 
    32   <gpcontrol:PenDetailControl id="penDetail" x="8" y="129"> 
    33   </gpcontrol:PenDetailControl> 
     32  <gpcontrol:PenDetailWindowControl id="penDetailWindow" x="10" y="101" layout="absolute" title="ペン"> 
     33  </gpcontrol:PenDetailWindowControl> 
    3434</mx:Application> 

  • as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint/controls/PenDetailControl.mxml

    r1107 r1108  
    11<?xml version="1.0" encoding="utf-8"?> 
    2 <mx:Canvas xmlns:mx="http://www.adobe.com/2006/mxml" width="108" height="348" backgroundAlpha="0" 
     2<mx:Canvas xmlns:mx="http://www.adobe.com/2006/mxml" width="108" height="342"  
    33  creationComplete="init()" 
    44  > 
    …… 
    77 
    88  <!-- preview --> 
     9  <mx:Label x="3" y="10" text="ペンの状態" width="53.5"/> 
    910  <mx:Canvas x="64.5" y="1" width="30" height="30" id="previewCanvas" borderStyle="solid" borderThickness="1" borderColor="#000000"> 
    1011  </mx:Canvas> 
    …… 
    2122  <mx:Grid x="15" y="77" borderStyle="none" borderColor="#000000" borderThickness="1" horizontalGap="4" verticalGap="3"> 
    2223    <mx:GridRow width="100%" height="100%"> 
    23       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#000000" id="gridItemPalette1" click="gridItemPaletteClickHandler(1);"> 
     24      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#000000" id="gridItemPalette1" click="gridItemPaletteClickHandler(1);" borderStyle="outset"> 
    2425      </mx:GridItem> 
    25       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#ffffff" id="gridItemPalette2" click="gridItemPaletteClickHandler(2);"> 
     26      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#ffffff" id="gridItemPalette2" click="gridItemPaletteClickHandler(2);" borderStyle="outset"> 
    2627      </mx:GridItem> 
    27       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#FFFFFF" id="gridItemPalette3" click="gridItemPaletteClickHandler(3);"> 
     28      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#FFFFFF" id="gridItemPalette3" click="gridItemPaletteClickHandler(3);" borderStyle="outset"> 
    2829      </mx:GridItem> 
    2930    </mx:GridRow> 
    3031    <mx:GridRow width="100%" height="100%"> 
    31       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#888888" id="gridItemPalette4" click="gridItemPaletteClickHandler(4);"> 
     32      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#888888" id="gridItemPalette4" click="gridItemPaletteClickHandler(4);" borderStyle="outset"> 
    3233      </mx:GridItem> 
    33       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#b47575" id="gridItemPalette5" click="gridItemPaletteClickHandler(5);"> 
     34      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#b47575" id="gridItemPalette5" click="gridItemPaletteClickHandler(5);" borderStyle="outset"> 
    3435      </mx:GridItem> 
    35       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#FFFFFF" id="gridItemPalette6" click="gridItemPaletteClickHandler(6);"> 
     36      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#FFFFFF" id="gridItemPalette6" click="gridItemPaletteClickHandler(6);" borderStyle="outset"> 
    3637      </mx:GridItem> 
    3738    </mx:GridRow> 
    3839    <mx:GridRow width="100%" height="100%"> 
    39       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#c096c0" id="gridItemPalette7" click="gridItemPaletteClickHandler(7);"> 
     40      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#c096c0" id="gridItemPalette7" click="gridItemPaletteClickHandler(7);" borderStyle="outset"> 
    4041      </mx:GridItem> 
    41       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#fa9696" id="gridItemPalette8" click="gridItemPaletteClickHandler(8);"> 
     42      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#fa9696" id="gridItemPalette8" click="gridItemPaletteClickHandler(8);" borderStyle="outset"> 
    4243      </mx:GridItem> 
    43       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#FFFFFF" id="gridItemPalette9" click="gridItemPaletteClickHandler(9);"> 
     44      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#FFFFFF" id="gridItemPalette9" click="gridItemPaletteClickHandler(9);" borderStyle="outset"> 
    4445      </mx:GridItem> 
    4546    </mx:GridRow> 
    4647    <mx:GridRow width="100%" height="100%"> 
    47       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#8080ff" id="gridItemPalette10" click="gridItemPaletteClickHandler(10);"> 
     48      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#8080ff" id="gridItemPalette10" click="gridItemPaletteClickHandler(10);" borderStyle="outset"> 
    4849      </mx:GridItem> 
    49       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#ffb6ff" id="gridItemPalette11" click="gridItemPaletteClickHandler(11);"> 
     50      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#ffb6ff" id="gridItemPalette11" click="gridItemPaletteClickHandler(11);" borderStyle="outset"> 
    5051      </mx:GridItem> 
    51       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#FFFFFF" id="gridItemPalette12" click="gridItemPaletteClickHandler(12);"> 
     52      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#FFFFFF" id="gridItemPalette12" click="gridItemPaletteClickHandler(12);" borderStyle="outset"> 
    5253      </mx:GridItem> 
    5354    </mx:GridRow> 
    5455    <mx:GridRow width="100%" height="100%"> 
    55       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#e7e58d" id="gridItemPalette13" click="gridItemPaletteClickHandler(13);"> 
     56      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#e7e58d" id="gridItemPalette13" click="gridItemPaletteClickHandler(13);" borderStyle="outset"> 
    5657      </mx:GridItem> 
    57       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#25c7c9" id="gridItemPalette14" click="gridItemPaletteClickHandler(14);"> 
     58      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#25c7c9" id="gridItemPalette14" click="gridItemPaletteClickHandler(14);" borderStyle="outset"> 
    5859      </mx:GridItem> 
    59       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#FFFFFF" id="gridItemPalette15" click="gridItemPaletteClickHandler(15);"> 
     60      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#FFFFFF" id="gridItemPalette15" click="gridItemPaletteClickHandler(15);" borderStyle="outset"> 
    6061      </mx:GridItem> 
    6162    </mx:GridRow> 
    6263    <mx:GridRow width="100%" height="100%"> 
    63       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#99cb80" id="gridItemPalette16" click="gridItemPaletteClickHandler(16);"> 
     64      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#99cb80" id="gridItemPalette16" click="gridItemPaletteClickHandler(16);" borderStyle="outset"> 
    6465      </mx:GridItem> 
    65       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#e7962d" id="gridItemPalette17" click="gridItemPaletteClickHandler(17);"> 
     66      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#e7962d" id="gridItemPalette17" click="gridItemPaletteClickHandler(17);" borderStyle="outset"> 
    6667      </mx:GridItem> 
    67       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#FFFFFF" id="gridItemPalette18" click="gridItemPaletteClickHandler(18);"> 
     68      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#FFFFFF" id="gridItemPalette18" click="gridItemPaletteClickHandler(18);" borderStyle="outset"> 
    6869      </mx:GridItem> 
    6970    </mx:GridRow> 
    7071    <mx:GridRow width="100%" height="100%"> 
    71       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#f9ddcf" id="gridItemPalette19" click="gridItemPaletteClickHandler(19);"> 
     72      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#f9ddcf" id="gridItemPalette19" click="gridItemPaletteClickHandler(19);" borderStyle="outset"> 
    7273      </mx:GridItem> 
    73       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#fcece2" id="gridItemPalette20" click="gridItemPaletteClickHandler(20);"> 
     74      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#fcece2" id="gridItemPalette20" click="gridItemPaletteClickHandler(20);" borderStyle="outset"> 
    7475      </mx:GridItem> 
    75       <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#FFFFFF" id="gridItemPalette21" click="gridItemPaletteClickHandler(21);"> 
     76      <mx:GridItem width="24" height="20" mouseDownEffect="selectPaletteEffect" backgroundColor="#FFFFFF" id="gridItemPalette21" click="gridItemPaletteClickHandler(21);" borderStyle="outset"> 
    7677      </mx:GridItem> 
    7778    </mx:GridRow> 
    …… 
    8990  <mx:ComboBox id="blendModeComboBox" x="6" y="316" width="97"> 
    9091  </mx:ComboBox> 
    91   <mx:Label x="3" y="10" text="ペンの状態" width="53.5"/> 
    9292   
    9393  <!-- palette select animation --> 
    …… 
    100100      import mx.effects.easing.Bounce; 
    101101  ]]> 
    102   </mx:Script>   
     102  </mx:Script> 
    103103</mx:Canvas>