Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

把画笔粗细调节栏移到扳手菜单 #139

Merged
merged 3 commits into from
Jun 2, 2024
Merged

把画笔粗细调节栏移到扳手菜单 #139

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a66c53
把画笔粗细调节栏移到扳手菜单
clover-yan Jun 1, 2024
d4da154
Merge branch 'wxriw/bug-fixes' into patch/ui
clover-yan Jun 1, 2024
7924d18
设置面板里面留一个
clover-yan Jun 1, 2024
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
19 changes: 17 additions & 2 deletions Ink Canvas/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@
<GroupBox Header="画板">
<ui:SimpleStackPanel Spacing="12">
<StackPanel Orientation="Horizontal">
<Slider x:Name="InkWidthSlider"
<Slider x:Name="InkWidthSlider"
HorizontalAlignment="Left"
Minimum="1" Maximum="20"
Width="330" FontFamily="Microsoft YaHei UI"
Expand Down Expand Up @@ -1196,10 +1196,25 @@
<ui:SymbolIcon Margin="0,0,0,0" Symbol="Camera" Foreground="{DynamicResource FloatBarForeground}" MouseDown="Border_MouseDown" MouseUp="SymbolIconScreenshot_MouseUp"/>
<Grid Height="24" Width="20">
<ui:SymbolIcon Symbol="Repair" Foreground="{DynamicResource FloatBarForeground}" MouseDown="Border_MouseDown" MouseUp="SymbolIconTools_MouseUp"/>
<Border Name="BorderTools" Margin="37,-157,-140,-6" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Border Name="BorderTools" Margin="37,-195,-140,-6" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<ui:SimpleStackPanel>
<Label Content="快捷设置" FontSize="14" Foreground="{DynamicResource FloatBarForeground}"
HorizontalAlignment="Left" Margin="8,8"/>
<Viewbox Margin="12,0,0,0" Height="38" Width="100" HorizontalAlignment="Left" VerticalAlignment="Top">
<ui:SimpleStackPanel>
<Label Margin="0,0,0,-2" Content="画笔粗细" Foreground="{DynamicResource ToolBarForeground}" FontSize="13" VerticalAlignment="Center"/>
<StackPanel Orientation="Horizontal">
<Slider HorizontalAlignment="Left"
Minimum="1" Maximum="20"
Width="100"
IsSnapToTickEnabled="True" Value="{Binding ElementName=InkWidthSlider, Path=Value, Mode=TwoWay}"
TickFrequency="1" TickPlacement="Both"/>
<TextBlock Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}"
VerticalAlignment="Bottom" Margin="10,0,0,8"
Width="15" FontSize="13"/>
</StackPanel>
</ui:SimpleStackPanel>
</Viewbox>
<Viewbox Margin="12,0,0,0" Height="32" Width="50" HorizontalAlignment="Left" VerticalAlignment="Top">
<ui:SimpleStackPanel>
<Label Margin="0,0,0,-2" Content="墨迹识别" Foreground="{DynamicResource FloatBarForeground}" FontSize="13" VerticalAlignment="Center"/>
Expand Down