equal
deleted
inserted
replaced
52 public StackPanel CreateMenuItem(Item item) |
52 public StackPanel CreateMenuItem(Item item) |
53 { |
53 { |
54 try |
54 try |
55 { |
55 { |
56 StackPanel MItem = new StackPanel(); |
56 StackPanel MItem = new StackPanel(); |
57 Microsoft.Surface.Presentation.Controls.SurfaceButton ItemButton = new Microsoft.Surface.Presentation.Controls.SurfaceButton(); |
57 CustomSurfaceButton ItemButton = new CustomSurfaceButton(); |
58 ItemButton.Content = item.Name; |
58 ItemButton.Content = item.Name; |
59 if (item.Items.Count > 0) |
59 if (item.Items.Count > 0) |
60 { |
60 { |
61 ItemButton.ContactDown += ButtonMenu_ContactDown; |
61 ItemButton.ContactDown += ButtonMenu_ContactDown; |
62 ItemButton.Click += ButtonMenu_ContactDown; |
62 ItemButton.Click += ButtonMenu_ContactDown; |
73 Temp.Visibility = Visibility.Collapsed; |
73 Temp.Visibility = Visibility.Collapsed; |
74 MItem.Children.Add(Temp); |
74 MItem.Children.Add(Temp); |
75 } |
75 } |
76 else |
76 else |
77 { |
77 { |
78 ItemButton.ContactDown += GenerateAction; |
78 ItemButton.Action = item.Action; |
79 ItemButton.Click += GenerateAction; |
79 //ItemButton.ContactDown += GenerateAction; |
|
80 //ItemButton.Click += GenerateAction; |
80 MItem.Children.Add(ItemButton); |
81 MItem.Children.Add(ItemButton); |
81 } |
82 } |
82 return MItem; |
83 return MItem; |
83 } |
84 } |
84 catch (Exception ex) |
85 catch (Exception ex) |
85 { |
86 { |
86 throw ex; |
87 throw ex; |
87 } |
88 } |
88 } |
89 } |
89 |
90 |
|
91 /* |
|
92 * Déplacé dans le CustomSurfaceButton |
|
93 |
90 private void GenerateAction(Object sender, RoutedEventArgs Event) |
94 private void GenerateAction(Object sender, RoutedEventArgs Event) |
91 { |
95 { |
92 try |
96 try |
93 { |
97 { |
94 ActionFactory.ActionGenerator AG = (new ActionFactory.ActionFactory()).GetGenerator(); |
98 ActionFactory.ActionGenerator AG = (new ActionFactory.ActionFactory()).GetGenerator(); |
99 //this.debug.addToList(action.GetType().ToString()); |
103 //this.debug.addToList(action.GetType().ToString()); |
100 } |
104 } |
101 } |
105 } |
102 catch (Exception e) { } |
106 catch (Exception e) { } |
103 } |
107 } |
|
108 |
|
109 * |
|
110 */ |
104 |
111 |
105 private void ButtonMenu_ContactDown(object sender, RoutedEventArgs e) |
112 private void ButtonMenu_ContactDown(object sender, RoutedEventArgs e) |
106 { |
113 { |
107 foreach (UIElement Child in ((Panel)((Microsoft.Surface.Presentation.Controls.SurfaceButton)sender).Parent).Children) |
114 foreach (UIElement Child in ((Panel)((CustomSurfaceButton)sender).Parent).Children) |
108 try |
115 try |
109 { |
116 { |
110 if (((StackPanel)Child).Name.Equals(((Microsoft.Surface.Presentation.Controls.SurfaceButton)sender).Content + "Panel")) |
117 if (((StackPanel)Child).Name.Equals(((Microsoft.Surface.Presentation.Controls.SurfaceButton)sender).Content + "Panel")) |
111 { |
118 { |
112 if (((StackPanel)Child).Visibility == Visibility.Collapsed) |
119 if (((StackPanel)Child).Visibility == Visibility.Collapsed) |