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.
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
Fixes for issues 190, 208, 217, 226, and 243 #247
Conversation
…ont to use the user's system default font and size from the WPF Theme. Added zoom scaling to the results window using ctrl + mousewheel or touch pinch manipulation. Tested on high res monitor, per-monitor DPI scaling, and touch screen.
…owner so it appears on same monitor as the main window.
…n text - other replace methods appear to work correctly.
…mber when in multiline mode
… not the commas, but the whitespace between the comma and the next file extension. After verifying the pattern does not match a file or directory with the space, the space should be removed.
Thanks! No worries. I think there's a way to do each PR in it's own branch, to limit the size. Once I get the build fixed, it'll be trivial to publish a new beta. |
Great! I got the notification, and just installed it from your build. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the only tweak I need is removing DefaultStyle, then I'll go ahead and merge. Thanks so much for the PR!
dnGREP.WPF/Dictionaries/Styles.xaml
Outdated
<Setter Property="Control.FontFamily" Value="Microsoft Sans Serif"/> | ||
<!-- removed to pick up defaults from the user's settings in Windows --> | ||
<!--<Setter Property="Control.FontSize" Value="12"/>--> | ||
<!--<Setter Property="Control.FontFamily" Value="Segoe UI"/>--> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like this style doesn't do anything now? Can we remove it, and references to it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I think we can probably remove it. I need to check if there are any styles based on this style, and test.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. Ya, full text search is a good idea. I wish "find all references" was XAML-aware.
tvSearchResult.PreviewMouseWheel += TvSearchResult_PreviewMouseWheel; | ||
tvSearchResult.PreviewTouchDown += TvSearchResult_PreviewTouchDown; | ||
tvSearchResult.PreviewTouchMove += TvSearchResult_PreviewTouchMove; | ||
tvSearchResult.PreviewTouchUp += TvSearchResult_PreviewTouchUp; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Curious, what's the "tv" prefix stand for?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tree View, I suspect. tvSearchResult was already the name of the control.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Gotcha. Looks like the original author was used to hungarian notation, which is not a good fit for C#/XAML, in my experience. Feel free to avoid it if you like. No need to change this PR.
dnGREP.WPF/Views/MainViewEx.xaml
Outdated
<ColumnDefinition Width="*"/> | ||
</Grid.ColumnDefinitions> | ||
<TextBlock Grid.Column="0" FontFamily="Microsoft Sans Serif" FontWeight="Bold" FontSize="16" Text="dnGREP"/> | ||
<TextBlock Grid.Column="0" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="18" Text="dnGREP" Margin="6,0,0,0"/> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hah, I fixed this, too... but forgot to push master. 🤦♂️ I'll merge your PR first, then take care of the conflicts. I also turned some grids to dockpanels, tweaked how the menu items got their height, and did a little XAML cleanup (might do more, later).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I started looking at some substantial layout changes to put the path comboBoxes on the main screen (Issue 179). When I get further, I'll show you some ideas.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@doug24 Got it merged. Had to fix a conflict by hand, so figured I'd pass along the diff for you to look at. Make sure I didn't butcher anything 😉
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, no problem, looks good to me.
…ve all references to it.
Added another change to remove the now empty DefaultStyle, and removed references to it. |
Additional changes that I think would be good to get into the next beta. A few small changes, put a larger one to implement zoom on the results window.
Sorry about the size of the last pull request - I did not realize that git would keep appending more changes to my first original pull request. I won't push anything else to my fork so they do not get merged into this request.