Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
3a0594f
- Changing Result item and hotkey layout
onesounds Sep 27, 2021
0c47557
Add Modern Theme
onesounds Sep 27, 2021
b07a437
delete margin
onesounds Sep 27, 2021
7789c1c
adjust padding
onesounds Sep 27, 2021
c6f1a00
adjust
onesounds Sep 27, 2021
53c04fd
Fix Separator
onesounds Sep 27, 2021
f07a009
- Add Textbox Caret Color
onesounds Sep 27, 2021
4ced995
- Delete Comment
onesounds Sep 27, 2021
f83212a
remove itemgroup in csproj.
onesounds Sep 27, 2021
c227ba3
- fix for build (recovery some item group)
onesounds Sep 27, 2021
3bc3563
- Rollback Classic Skins
onesounds Sep 28, 2021
46917ea
but default hotkey color is not same subtitle color in classicthemes …
onesounds Sep 28, 2021
3e25030
Merge branch 'ModernTheme' of https://github.com/onesounds/Flow.Launc…
onesounds Sep 28, 2021
91d21a7
- Search Ico- In the theme, search icons can be inserted and styled (…
onesounds Sep 28, 2021
505b4cb
fix win11light theme seperator margin
onesounds Sep 28, 2021
8eba28f
- fix the theme preview in setting window
onesounds Sep 28, 2021
f1bfa5c
Fix Selected color in Darker.theme
onesounds Sep 30, 2021
9d10b7f
Fix the White Querybox in Metro Server.theme
onesounds Sep 30, 2021
bb7b0cd
- Add Magnifier in Win 11 Light/Dark Theme
onesounds Sep 30, 2021
ecb0cac
- Add listbox clipping class for rounded corner theme.
onesounds Oct 1, 2021
6a58576
- clean code
onesounds Oct 1, 2021
136f227
- Fix Responsive Query Area
onesounds Oct 1, 2021
c89d277
- Fix Responsive Query Area
onesounds Oct 1, 2021
49f00f5
- Fix List Item Margin
onesounds Oct 1, 2021
8e93969
- Fix pink theme (querybox witdh)
onesounds Oct 1, 2021
6048de4
- Fix Querybox Width
onesounds Oct 1, 2021
6211275
- Fix Setting window preview (last item clip)
onesounds Oct 1, 2021
c32ae79
Merge branch 'ModernTheme' of https://github.com/onesounds/Flow.Launc…
onesounds Oct 1, 2021
2b7855c
Change default Scrollbar Thumb color
onesounds Oct 1, 2021
39b53d9
Change default Scrollbar Thumb color
onesounds Oct 1, 2021
2144577
- Adjust Theme Preivew in setting window
onesounds Oct 1, 2021
03d134d
Add sublime theme
onesounds Oct 1, 2021
6e047e0
Fix Icon Image little cut #710
onesounds Oct 1, 2021
e7b4dd1
- Add ItemHotkeySelectedStyle Property
onesounds Oct 2, 2021
df3c5bf
- Add ItemHotkeySelectedStyle Property
onesounds Oct 2, 2021
89f4f5d
Fix Win11Light font size
onesounds Oct 2, 2021
1621f34
Fix Win11Light font size
onesounds Oct 2, 2021
92f0041
Merge branch 'ModernTheme' of https://github.com/onesounds/Flow.Launc…
onesounds Oct 2, 2021
c1b0929
- Redesign Setting Window
onesounds Oct 3, 2021
832405a
- Adjust base.xaml to match original(1.8) size for classic themes
onesounds Oct 4, 2021
1c96f04
- Adjust base.xaml to match original(1.8) size for classic themes
onesounds Oct 4, 2021
ca179be
- Adjust Plugin Tab in setting window
onesounds Oct 4, 2021
ed5bd5b
Merge branch 'ModernTheme' of https://github.com/onesounds/Flow.Launc…
onesounds Oct 4, 2021
4e01019
Merge branch 'ModernTheme' of https://github.com/onesounds/Flow.Launc…
onesounds Oct 4, 2021
d084793
Merge branch 'ModernTheme' of https://github.com/onesounds/Flow.Launc…
onesounds Oct 4, 2021
e201df9
- Fix Dropshadow
onesounds Oct 4, 2021
6c43a48
- Add Left/Right Key for context menu.
onesounds Oct 4, 2021
a5534ca
Update Flow.Launcher/Converters/BorderClipConverter.cs
onesounds Oct 5, 2021
d1e7b4e
Update Flow.Launcher/Flow.Launcher.csproj
onesounds Oct 5, 2021
1948ec5
Update Flow.Launcher/Flow.Launcher.csproj
onesounds Oct 5, 2021
88a9767
- delete csproj
onesounds Oct 5, 2021
10accd5
- Change value progress bar (using actual window)
onesounds Oct 5, 2021
d902a1e
use switch statement for Left/Right context menu logic
jjw24 Oct 5, 2021
e14bb23
- Merge "use switch statement for Left/Right context menu logic"
onesounds Oct 5, 2021
1b1a81d
- Rollback progressbar
onesounds Oct 5, 2021
12f95d1
- Fix Sperator(if it has) is not visible in the context menu or history.
onesounds Oct 5, 2021
25b5f30
- Add automatically height for subtitle.
onesounds Oct 5, 2021
8aaeb85
- item of *.lnk remove subtitle (for test)
onesounds Oct 5, 2021
66e722b
- Change context icon to glyph in some plugin
onesounds Oct 6, 2021
1149ff5
- Add Close Context menu in main window query bar
onesounds Oct 6, 2021
c74a2db
- Add clock in query bar (sublime theme only)
onesounds Oct 6, 2021
763cab8
Revert "- Add clock in query bar (sublime theme only)"
onesounds Oct 6, 2021
54145d7
revert subtitle change
jjw24 Oct 6, 2021
5f0df98
adjust Program plugin width
jjw24 Oct 6, 2021
04a10ed
add glyph option to settings
jjw24 Oct 7, 2021
4f19355
update wording
jjw24 Oct 7, 2021
1d746c2
- Fix ProgressBar (Finally!)
onesounds Oct 7, 2021
42dda34
add ItemHotkeyStyle key into dictionary
jjw24 Oct 8, 2021
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: 2 additions & 2 deletions Flow.Launcher/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@
</Canvas>
</Grid>

<Grid>
<Grid ClipToBounds="True">
<Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}" />
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the height cannot be given, a rectangle was used instead of a separator.

<Line x:Name="ProgressBar" HorizontalAlignment="Right"
Style="{DynamicResource PendingLineStyle}" Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Y1="0" Y2="0" X1="0" X2="100" Height="2" Width="752" StrokeThickness="1">
Y1="0" Y2="0" X1="-150" X2="-50" Height="2" Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Grid}},Path=ActualWidth}" StrokeThickness="1">
</Line>
</Grid>

Expand Down
4 changes: 2 additions & 2 deletions Flow.Launcher/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,9 @@ private void InitializeNotifyIcon()

private void InitProgressbarAnimation()
{
var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 100,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I Adjusted Progress Animation. I think it's a little weird to get the window size (ActualWidth in progress function) but I don't know the reason. I don't think I'll make a theme with a larger width, so I just put in a fixed value and it came out well, so I did it. The color was also more noticeably adjusted.

I would think getting the ActualWidth is so it's dynamically adjusted for the toValue in the method. What was the issue with using ActualWidth? Problem with putting in 900 is that the next person is not going to understand why 900 was chosen.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's because the animation has to go outside window. Anyway, it was fixed to add +100 to the actual width.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah and i dont understand why add 100 lol, magic number

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think I'll make a theme with a larger width, so I just put in a fixed value and it came out well, so I did it. The color was also more noticeably adjusted.

if you are reverting back to using ActualWidth, will it erase this improvement you mentioned about the color and noticeability of the progress animation?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

da1's 100 number is progressbar width size. (it is not gauge.) it will move left to right actual window size.
one more add 100 (200) is to make it go outside altogether. (Before I fixed it, it was stopped befre go outside.) I don't know if I understood because I didn't make it, but it works as my intended now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sry, No. it's not moving properly. I'll look a bit more.

var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 150,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Finally Progress bar fixed. I think it's my last push in this branch. I'll do something other branch.

The fixed Width size was the problem. I mistook activewidth for window size.
So I changed let Progressbar bring the width of parent grid.

Adjust
To prevent the progress bar from appearing suddenly, I changed the start and end position to more than window size. In this case, it goes out of the screen, so clip bound was applied to parent grid. (Clip bound sadly only works in like this case. If this worked for selected item, I wouldn't have to suffer.)

new Duration(new TimeSpan(0, 0, 0, 0, 1600)));
var da1 = new DoubleAnimation(ProgressBar.X1, ActualWidth, new Duration(new TimeSpan(0, 0, 0, 0, 1600)));
var da1 = new DoubleAnimation(ProgressBar.X1, ActualWidth + 50, new Duration(new TimeSpan(0, 0, 0, 0, 1600)));
Storyboard.SetTargetProperty(da, new PropertyPath("(Line.X2)"));
Storyboard.SetTargetProperty(da1, new PropertyPath("(Line.X1)"));
_progressBarStoryboard.Children.Add(da);
Expand Down