michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-10-31 13:03:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix context menu conflicts with commit info popup panel

Browse source
This commit is contained in:
leo 2020-07-15 11:49:16 +08:00
parent b06fe3d477
commit a30ac86617
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SourceGit/UI/Blame.xaml.cs
View file

@ -84,7 +84,9 @@ namespace SourceGit.UI {
p.Background = BG[i % 2]; p.Background = BG[i % 2];
p.Foreground = FindResource("Brush.FG") as SolidColorBrush; p.Foreground = FindResource("Brush.FG") as SolidColorBrush;
p.FontStyle = FontStyles.Normal; p.FontStyle = FontStyles.Normal;
p.MouseRightButtonDown += (sender, ev) => { p.ContextMenuOpening += (sender, ev) => {
if (!content.Selection.IsEmpty) return;
Hyperlink link = new Hyperlink(new Run(frag.CommitSHA)); Hyperlink link = new Hyperlink(new Run(frag.CommitSHA));
link.ToolTip = "CLICK TO GO"; link.ToolTip = "CLICK TO GO";
link.Click += (o, e) => { link.Click += (o, e) => {
@ -105,6 +107,7 @@ namespace SourceGit.UI {
authorName.Content = frag.Author; authorName.Content = frag.Author;
authorTime.Content = frag.Time; authorTime.Content = frag.Time;
popup.IsOpen = true; popup.IsOpen = true;
ev.Handled = true;
}; };
var formatter = new FormattedText( var formatter = new FormattedText(

1
SourceGit/UI/Dashboard.xaml
View file

@ -5,7 +5,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:source="clr-namespace:SourceGit" xmlns:source="clr-namespace:SourceGit"
xmlns:local="clr-namespace:SourceGit.UI" xmlns:local="clr-namespace:SourceGit.UI"
xmlns:git="clr-namespace:SourceGit.Git"
xmlns:converters="clr-namespace:SourceGit.Converters" xmlns:converters="clr-namespace:SourceGit.Converters"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800" d:DesignHeight="450" d:DesignWidth="800"