From: HOSOKAWA Kenchi Date: Sun, 29 Aug 2010 02:05:59 +0000 (+0900) Subject: sasas X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=97a97a46267462940a24f18ad5bbd0f77006dfd9;p=psychlops%2Fsilverlight.git sasas --- diff --git a/dev4/psychlops/core/graphic/canvas.cs b/dev4/psychlops/core/graphic/canvas.cs index be3cbae..c46f9fb 100644 --- a/dev4/psychlops/core/graphic/canvas.cs +++ b/dev4/psychlops/core/graphic/canvas.cs @@ -10,7 +10,7 @@ using System.Windows.Shapes; using System.Windows.Browser; using System.Collections.Generic; - + namespace Psychlops @@ -237,7 +237,7 @@ namespace Psychlops Psychlops.Internal.Main.widgetStack.Orientation = Orientation.Vertical; Psychlops.Internal.Main.widgetStack.Height = hei; api_canvas.Children.Add(Psychlops.Internal.Main.widgetStack); - + Internal.Main.statusBar.Visibility = Visibility.Collapsed; UIElementPool = new System.Windows.Controls.Canvas[CONST.MAX_OBJ_N]; diff --git a/test4/MainPage.xaml.cs b/test4/MainPage.xaml.cs index 3925f7b..5c0b625 100644 --- a/test4/MainPage.xaml.cs +++ b/test4/MainPage.xaml.cs @@ -41,15 +41,6 @@ namespace PsychlopsSilverlight4test //Psychlops.Internal.Main.widgetStack = Controller; AppStatusBar.Text = "Now starting Psychlops environment... please wait a minute"; - - var ur = new System.Uri("Resources/logo.png", System.UriKind.RelativeOrAbsolute); - var bitmap = new System.Windows.Media.Imaging.BitmapImage(ur); - var img = new System.Windows.Controls.Image(); - img.Source = bitmap; - System.Windows.Controls.Canvas.SetLeft(img, 100); - System.Windows.Controls.Canvas.SetTop(img, 100); - LayoutRoot.Children.Add(img); - } protected void getFocusMouseEnter(object sender, System.Windows.Input.MouseEventArgs e) { this.Focus();