diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml index 04463450..052cbad9 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml @@ -22,9 +22,7 @@ - - - + @@ -71,10 +69,17 @@ Grid.Row="2" SelectionChanged="RoomPicker_SelectionChanged" ItemsSource="{Binding RoomPickerList, ElementName=root, Mode=OneWay}" - FullModeItemTemplate="{StaticResource RoomPickerItemTemplate}" FullModeHeader="{Binding Path=LocalizedResources.Rooms, Source={StaticResource LocalizedStrings}}" - Opacity="0"/> - + Opacity="0"> + + + + + + + + + - + + + + + + + + + diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/MultiValueTextBlock.xaml b/CampusAppWP8/CampusAppWP8/Utility/Lui/MultiValueTextBlock.xaml index c7087f5b..953e0365 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Lui/MultiValueTextBlock.xaml +++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/MultiValueTextBlock.xaml @@ -7,7 +7,8 @@ FontFamily="{StaticResource PhoneFontFamilyNormal}" FontSize="{StaticResource PhoneFontSizeNormal}" Foreground="{StaticResource PhoneForegroundBrush}" + x:Name="root" > - - + + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/MultiValueTextBlock.xaml.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/MultiValueTextBlock.xaml.cs index ef9e3484..bc77cc27 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Lui/MultiValueTextBlock.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/MultiValueTextBlock.xaml.cs @@ -43,6 +43,9 @@ namespace CampusAppWP8.Utility.Lui /// The converter property. public static readonly DependencyProperty ConverterProperty = DependencyProperty.Register("Converter", typeof(IValueConverter), typeof(MultiValueTextBlock), new PropertyMetadata(null)); + /// The text style property. + public static readonly DependencyProperty TextStyleProperty = DependencyProperty.Register("TextStyle", typeof(Style), typeof(MultiValueTextBlock), new PropertyMetadata(null)); + #endregion // DependencyProperties #region Constructor @@ -59,6 +62,21 @@ namespace CampusAppWP8.Utility.Lui #region Properties + /// Gets or sets the text style. + /// The text style. + public Style TextStyle + { + get + { + return (Style)this.GetValue(TextStyleProperty); + } + + set + { + this.SetValue(TextStyleProperty, value); + } + } + /// Gets or sets the converter. /// The converter. public IValueConverter Converter