Skip to content
This repository has been archived by the owner on Aug 15, 2023. It is now read-only.

重构项目 #17

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

重构项目 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d623ec3
修正bug:登录界面颜色分层
kitUIN Aug 5, 2022
4d8d024
评论栏自动换行
kitUIN Aug 5, 2022
91beb14
加深评论背景
kitUIN Aug 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@
/ARM
/bikabika/ARM
/bikabika/ARM/Release
/Release/bikabika
/bikabika/Release
/bikabika/ARM64/Release
/ARM64
2 changes: 1 addition & 1 deletion bikabika/BikaImage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void winrt::bikabika::implementation::BikaImage::BikaImg_ImageFailed(winrt::Wind
}


Windows::Foundation::IAsyncAction winrt::bikabika::implementation::BikaImage::BikaImg_ImageOpened(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e)
void winrt::bikabika::implementation::BikaImage::BikaImg_ImageOpened(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e)
{
ImageLoaded(true);
RefreshIcon().Visibility(Visibility::Collapsed);
Expand Down
2 changes: 1 addition & 1 deletion bikabika/BikaImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace winrt::bikabika::implementation

public:
void BikaImg_ImageFailed(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::ExceptionRoutedEventArgs const& e);
Windows::Foundation::IAsyncAction BikaImg_ImageOpened(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
void BikaImg_ImageOpened(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
void RefreshIcon_PointerPressed(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
};
}
Expand Down
87 changes: 45 additions & 42 deletions bikabika/InfoPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@
IsTextSelectionEnabled="True"
Text="{x:Bind Book.Description, Mode=OneWay}"
TextWrapping="Wrap" />
<Grid Grid.Row="1" MinWidth="500">
<Grid Grid.Row="1" MinWidth="520">
<Border
x:Name="CreaterBorder"
Padding="10"
Expand Down Expand Up @@ -913,12 +913,8 @@
</PivotItem.Header>
<PivotItem.Content>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="50" />
</Grid.RowDefinitions>
<ScrollViewer
Grid.Row="0"
Margin="0,0,0,50"
Padding="5,0,5,0"
VerticalScrollBarVisibility="Hidden"
ViewChanged="ScrollViewer_ViewChanged">
Expand Down Expand Up @@ -1107,46 +1103,53 @@
</muxc:ItemsRepeater>
</ScrollViewer>
<Border
Grid.Row="1"
Padding="5"
Background="{ThemeResource LayerFillColorDefaultBrush}"
HorizontalAlignment="Center"
VerticalAlignment="Bottom"
Background="#fff4f9"
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
BorderThickness="1.5"
CornerRadius="10"
Opacity="0.9">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="50" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="65" />
</Grid.ColumnDefinitions>
<PersonPicture
x:Name="UserThumb"
Grid.Column="0"
Height="32"
Margin="5,0,0,0" />
<TextBox
x:Name="SendContent"
Grid.Column="1"
Margin="5,0,0,0" />
<Button
x:Uid="ButtonSend"
Grid.Column="2"
Margin="10,0,0,0"
Click="ButtonSend_Click" />
</Grid>
CornerRadius="10">
<StackPanel Width="405" Orientation="Vertical">

<muxc:InfoBar
x:Name="InfoReply"
Margin="0,0,0,5"
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
FontSize="13"
FontWeight="Bold"
Foreground="{ThemeResource SystemAccentColorDark2}"
IsIconVisible="True"
IsOpen="False"
Severity="Informational" />
<Grid HorizontalAlignment="Center">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="50" />
<ColumnDefinition Width="290" />
<ColumnDefinition Width="65" />
</Grid.ColumnDefinitions>
<PersonPicture
x:Name="UserThumb"
Grid.Column="0"
Height="32"
Margin="5,0,0,0" />
<TextBox
x:Name="SendContent"
Grid.Column="1"
Margin="5,0,0,0"
AcceptsReturn="True"
IsSpellCheckEnabled="True"
TextWrapping="Wrap" />
<Button
x:Uid="ButtonSend"
Grid.Column="2"
Margin="10,0,0,0"
Click="ButtonSend_Click" />
</Grid>
</StackPanel>
</Border>
<muxc:InfoBar
x:Name="InfoReply"
Margin="0,0,0,5"
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
FontSize="13"
FontWeight="Bold"
Foreground="{ThemeResource SystemAccentColorDark2}"
IsIconVisible="True"
IsOpen="False"
Severity="Informational" />

</Grid>
</PivotItem.Content>
</PivotItem>
Expand Down
Loading