进一步解决布局问题

splwany · Oct 16, 2016 · eedaa78 · eedaa78
1 parent 2b815f4
commit eedaa78
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/bilibili2/Assets/LOGOTITLE.png b/bilibili2/Assets/LOGOTITLE.png
diff --git a/bilibili2/MainPage.xaml b/bilibili2/MainPage.xaml
@@ -420,16 +420,11 @@
                 <ColumnDefinition Width="130"/>
             </Grid.ColumnDefinitions>
             <Grid Grid.Column="3" x:Name="TrueTitleBar" Background="Transparent">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-                <Image Grid.Column="0" Stretch="Uniform" VerticalAlignment="Center" HorizontalAlignment="Right" Source="ms-appx:///Assets/LOGOTITLE.png" Height="24"/>
-                <TextBlock Grid.Column="1" x:Name="caption" Text="Bilibili" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="12" FontFamily="Segoe UI" FontWeight="Normal" Margin="0"/>
+                <Image Grid.Column="0" Stretch="Uniform" VerticalAlignment="Center" HorizontalAlignment="Center" Source="ms-appx:///Assets/LOGOTITLE.png" Height="24"/>
             </Grid>
-            <Button Grid.Column="0" x:Name="btn_back" Style="{ThemeResource TitleBarBackButtonTheme}" Width="48" Height="32" Background="{ThemeResource Bili-ForeColor}"/>
-            <Button Grid.Column="1" x:Name="btn_refresh" Style="{ThemeResource TitleBarRefreshButtonTheme}" Width="48" Height="32" Background="{ThemeResource Bili-ForeColor}"/>
-            <Button Grid.Column="2" x:Name="btn_search" Style="{ThemeResource TitleBarSearchButtonTheme}" Width="48" Height="32" Background="{ThemeResource Bili-ForeColor}"/>
+            <Button Grid.Column="0" x:Name="btn_back" Style="{ThemeResource TitleBarBackButtonTheme}" Width="48" Height="32" Background="{ThemeResource Bili-ForeColor}" Foreground="White"/>
+            <Button Grid.Column="1" x:Name="btn_refresh" Style="{ThemeResource TitleBarRefreshButtonTheme}" Width="48" Height="32" Background="{ThemeResource Bili-ForeColor}" Foreground="White"/>
+            <Button Grid.Column="2" x:Name="btn_search" Style="{ThemeResource TitleBarSearchButtonTheme}" Width="48" Height="32" Background="{ThemeResource Bili-ForeColor}" Foreground="White"/>
         </Grid>
         <SplitView x:Name="sp_View" Grid.Row="2" OpenPaneLength="200"   PaneBackground="{ThemeResource Bili-MenuBack}"  DisplayMode="Overlay" PaneClosed="sp_View_PaneClosed" >
             <SplitView.Pane>
@@ -546,7 +541,7 @@
                     <TextBlock Text="首页" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
 
                     <StackPanel Orientation="Horizontal" Grid.ColumnSpan="2" HorizontalAlignment="Right" >
-                        <AppBarButton x:Name="btn_GoFind" Icon="Find" Width="48" Height="48" Foreground="White" Click="btn_GoFind_Click"/>
+                        <AppBarButton x:Name="btn_GoFind" Icon="Contact" Width="48" Height="48" Foreground="White" Click="btn_GoFind_Click"/>
                         <AutoSuggestBox x:Name="top_txt_find"   PlaceholderText="输入关键字或AV号" Visibility="Collapsed" Height="32"  Width="180" QueryIcon="Find" Grid.Column="2" VerticalAlignment="Center" VerticalContentAlignment="Center" HorizontalAlignment="Right" Margin="5,0"  Style="{StaticResource AutoSuggestBoxStyle1}"  TextChanged="top_txt_find_TextChanged" QuerySubmitted="top_txt_find_QuerySubmitted" SuggestionChosen="top_txt_find_SuggestionChosen"/>
                         <AppBarButton Icon="Download" Visibility="Collapsed" Width="48" Height="48" Foreground="White"></AppBarButton>