8000 ux: new style for submodule tooltip (#1307) · sourcegit-scm/sourcegit@d336342 · GitHub
[go: up one dir, main page]
Skip to content

Commit d336342

Browse files
love-lingerlove-linger
committed
ux: new style for submodule tooltip (#1307)
1 parent f83b6c2 commit d336342

File tree

1 file changed

+48
-44
lines changed

1 file changed

+48
-44
lines changed

‎src/Views/Repository.axaml

Lines changed: 48 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -356,55 +356,59 @@
356356
<TextBlock FontWeight="Bold" Margin="4,0,0,0" Text="{Binding Path}"/>
357357
</StackPanel>
358358

359-
<Grid RowDefinitions="24,24,24" ColumnDefinitions="Auto,Auto" Margin="0,8,0,0">
360-
<TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.CommitDetail.Info.SHA}" VerticalAlignment="Center"/>
361-
<TextBlock Grid.Row="0" Grid.Column="1"
362-
Margin="8,0,0,0"
363-
Text="{Binding SHA}"
364-
Foreground="DarkOrange"
365-
VerticalAlignment="Center"/>
359+
<Grid RowDefinitions="24,24" ColumnDefinitions="Auto,Auto" Margin="0,8,0,0">
360+
<TextBlock Grid.Row="0" Grid.Column="0"
361+
Classes="info_label"
362+
HorizontalAlignment="Left" VerticalAlignment="Center"
363+
Text="{DynamicResource Text.CommitDetail.Info.SHA}"/>
364+
<StackPanel Grid.Row="0" Grid.Column="1"
365+
Orientation="Horizontal"
366+
Margin="8,0,0,0">
367+
<TextBlock Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
368+
VerticalAlignment="Center"/>
369+
370+
<Path Margin="6,0,0,0"
371+
HorizontalAlignment="Left" VerticalAlignment="Center"
372+
Width="12" Height="12"
373+
Data="{StaticResource Icons.Check}"
374+
Fill="Green"
375+
IsVisible="{Binding Status, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:SubmoduleStatus.Normal}}"/>
376+
<Border Height="16"
377+
Margin="6,0,0,0" Padding="4,0"
378+
HorizontalAlignment="Left" VerticalAlignment="Center"
379+
Background="DarkOrange"
380+
CornerRadius="4"
381+
IsVisible="{Binding Status, Converter={x:Static ObjectConverters.NotEqual}, ConverterParameter={x:Static m:SubmoduleStatus.Normal}}">
382+
<Grid>
383+
<TextBlock VerticalAlignment="Center"
384+
Text="{DynamicResource Text.Submodule.Status.NotInited}"
385+
Foreground="White"
386+
IsVisible="{Binding Status, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:SubmoduleStatus.NotInited}}"/>
387+
<TextBlock VerticalAlignment="Center"
388+
Text="{DynamicResource Text.Submodule.Status.Modified}"
389+
Foreground="White"
390+
IsVisible="{Binding Status, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:SubmoduleStatus.Modified}}"/>
391+
<TextBlock VerticalAlignment="Center"
392+
Text="{DynamicResource Text.Submodule.Status.RevisionChanged}"
393+
Foreground="White"
394+
IsVisible="{Binding Status, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:SubmoduleStatus.RevisionChanged}}"/>
395+
<TextBlock VerticalAlignment="Center"
396+
Text="{DynamicResource Text.Submodule.Status.Unmerged}"
397+
Foreground="White"
398+
IsVisible="{Binding Status, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:SubmoduleStatus.Unmerged}}"/>
399+
</Grid>
400+
</Border>
401+
</StackPanel>
366402

367-
<TextBlock Grid.Row="1" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.Submodule.URL}" VerticalAlignment="Center"/>
403+
<TextBlock Grid.Row="1" Grid.Column="0"
404+
Classes="info_label"
405+
HorizontalAlignment="Left" VerticalAlignment="Center"
406+
Text="{DynamicResource Text.Submodule.URL}"/>
368407
<TextBlock Grid.Row="1" Grid.Column="1"
369408
Margin="8,0,0,0"
370409
Text="{Binding URL}"
371410
Foreground="{DynamicResource Brush.Link}"
372-
VerticalAlignment="Center"/>
373-
374-
<TextBlock Grid.Row="2" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.Submodule.Status}" VerticalAlignment="Center"/>
375-
<Path Grid.Row="2" Grid.Column="1"
376-
Margin="8,0,0,0"
377-
HorizontalAlignment="Left" VerticalAlignment="Center"
378-
Width="12" Height="12"
379-
Data="{StaticResource Icons.Check}"
380-
Fill="Green"
381-
IsVisible="{Binding Status, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:SubmoduleStatus.Normal}}"/>
382-
<Border Grid.Row="2" Grid.Column="1"
383-
Height="16"
384-
Margin="8,0,0,0" Padding="4,0"
385-
HorizontalAlignment="Left" VerticalAlignment="Center"
386-
Background="DarkOrange"
387-
CornerRadius="4"
388-
IsVisible="{Binding Status, Converter={x:Static ObjectConverters.NotEqual}, ConverterParameter={x:Static m:SubmoduleStatus.Normal}}">
389-
<Grid>
390-
<TextBlock VerticalAlignment="Center"
391-
Text="{DynamicResource Text.Submodule.Status.NotInited}"
392-
Foreground="White"
393-
IsVisible="{Binding Status, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:SubmoduleStatus.NotInited}}"/>
394-
<TextBlock VerticalAlignment="Center"
395-
Text="{DynamicResource Text.Submodule.Status.Modified}"
396-
Foreground="White"
397-
IsVisible="{Binding Status, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:SubmoduleStatus.Modified}}"/>
398-
<TextBlock VerticalAlignment="Center"
399-
Text="{DynamicResource Text.Submodule.Status.RevisionChanged}"
400-
Foreground="White"
401-
IsVisible="{Binding Status, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:SubmoduleStatus.RevisionChanged}}"/>
402-
<TextBlock VerticalAlignment="Center"
403-
Text="{DynamicResource Text.Submodule.Status.Unmerged}"
404-
Foreground="White"
405-
IsVisible="{Binding Status, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:SubmoduleStatus.Unmerged}}"/>
406-
</Grid>
407-
</Border>
411+
VerticalAlignment="Center"/>
408412
</Grid>
409413
</StackPanel>
410414
</ToolTip.Tip>

0 commit comments

Comments
 (0)
0