Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
9d21649
Change UI rendering logic
taooceros Nov 10, 2020
0e0f24f
Lazy Load Image
bao-qian Oct 23, 2020
52887aa
Batch process ui change with interval 50ms
taooceros Nov 11, 2020
ebddf19
Fix not canceled token and adding comment
taooceros Nov 11, 2020
1b76da1
Add remove previous query result back to keep different action word d…
taooceros Nov 12, 2020
f51d2c5
keep all result in result list view
taooceros Nov 12, 2020
4b2abfc
Reduce batch time to speed up view update
taooceros Nov 13, 2020
e625c19
remove unused code
taooceros Nov 13, 2020
e34a52c
Don't change selected index unless collection is not empty
taooceros Nov 14, 2020
a4147f5
Block Notifychange unless all the element is added into the observabl…
taooceros Nov 14, 2020
dab8c5d
Block Notifychange unless all the element is added into the observabl…
taooceros Nov 14, 2020
55d30ca
Merge
taooceros Nov 14, 2020
4cf143d
Don't notify change until finishing up adding new result
taooceros Nov 14, 2020
3076e50
add null check when processing result update
taooceros Nov 14, 2020
0af9fb0
Merge remote-tracking branch 'upstream/dev' into RenderImprovement
taooceros Nov 14, 2020
7dc2473
remove check of empty of Results when change selected index
taooceros Nov 14, 2020
c89ee33
Use Virtualizing StackPanel instead of GridView to greatly reduce the…
taooceros Nov 15, 2020
dc982e2
Use a default image to list when the image hasn't been loaded in cache.
taooceros Nov 15, 2020
4dd4cda
Revert "Use Virtualizing StackPanel instead of GridView to greatly re…
taooceros Nov 15, 2020
b1dd7b4
Move Image Cache filtering earlier
taooceros Nov 15, 2020
2161f27
fix unintended token argument pass
taooceros Nov 16, 2020
e7c02da
change SetImage to method instead of property to avoid unintended use
taooceros Nov 16, 2020
0a9bad3
Use Customized LazyAsync class to load image instead of the weird way…
taooceros Nov 16, 2020
d9ef682
change default image property name
taooceros Nov 16, 2020
71cac9c
change the way of checking whether cache exist
taooceros Nov 16, 2020
23d9e25
Add some cancellationtoken check
taooceros Nov 16, 2020
2b423d9
Use single add notify for each element when the new Item is small or …
taooceros Nov 17, 2020
6e87b92
Merge remote-tracking branch 'upstream/dev' into RenderImprovement
taooceros Nov 20, 2020
6863b41
Use TPL's BufferBlock instead of BlockingCollection, which will block…
taooceros Nov 20, 2020
ea5e9a0
Use New keyword for customized lazyAsync Value property
taooceros Nov 20, 2020
4fb884c
Wait 50 ms for query staying same when updating view.
taooceros Nov 20, 2020
f11b302
slighly reduce the delay time
taooceros Nov 21, 2020
34dc0d0
move progressbar task position and change the way of comparison
taooceros Nov 21, 2020
9bc58fe
Only stop querying for global query
taooceros Nov 22, 2020
8f6f2fb
Merge remote-tracking branch 'upstream/dev' into RenderImprovement
taooceros Nov 22, 2020
81a02c6
Don't add result to queue unless the query match (plugin event driven…
taooceros Nov 24, 2020
c110749
Add more cancellation
taooceros Nov 24, 2020
69e11e2
Use CancellationToken.IsCancellationRequested wherever is possible to…
taooceros Nov 24, 2020
b8b0e8c
Merge branch 'dev' into RenderImprovement
jjw24 Nov 26, 2020
1c6769c
fix merge
jjw24 Nov 26, 2020
05aa706
Change ErrorIcon to MissingImgIcon in ImageCache check since we don't…
taooceros Nov 27, 2020
813e9b5
fix selected item doesn't always be the first item issue.
taooceros Nov 28, 2020
6b96228
Merge ImageCache change
taooceros Nov 28, 2020
a640ead
Use List instead of ObservableCollection as base class for resultcoll…
taooceros Nov 29, 2020
19c7446
Add Lock to the place we directly update the ResultCollection
taooceros Dec 2, 2020
98e6a1a
Revert using List instead of observablecollection
taooceros Dec 2, 2020
e7dd867
Change some code and check out what cause those error
taooceros Dec 2, 2020
25bc2a7
Add timeout for waiting collectionchange event, although seems the de…
taooceros Dec 3, 2020
eb13a18
Use task.run in addresult instead of CollectionChange event.
taooceros Dec 3, 2020
01158fd
Add error handling for the resultUpdateTask to make sure result updat…
taooceros Dec 4, 2020
aa20d50
Revert creating a new task when adding result.
taooceros Dec 4, 2020
6267fa9
fix typo.
taooceros Dec 4, 2020
c3d5d4c
Don't update collection when both newItems and collection is empty
taooceros Dec 4, 2020
756c5bc
fix using unintialized variable in release.
taooceros Dec 4, 2020
b8d3b42
use singleordefault instead of single since sometims the queue may be…
taooceros Dec 5, 2020
968931e
return if cancellation requested before changing _isQueryRunning state
taooceros Dec 22, 2020
2b90088
Merge Dev
taooceros Jan 6, 2021
6b597f7
throw exception if debug for Log.exception(className, message, except…
taooceros Jan 6, 2021
0d24aba
Use actionkeyword comparison to determine whether delay querying.
taooceros Jan 6, 2021
82fc546
Merge remote-tracking branch 'origin/RenderImprovement' into RenderIm…
taooceros Jan 9, 2021
3aa54d1
Merge remote-tracking branch 'upstream/dev' into RenderImprovement
taooceros Jan 9, 2021
08e163c
Merge branch 'dev' into RenderImprovement
jjw24 Jan 10, 2021
30ececd
Merge remote-tracking branch 'upstream/dev' into RenderImprovement
taooceros Jan 10, 2021
97052b1
fix merge issue
taooceros Jan 10, 2021
691c2b0
increase edittime boundary
taooceros Jan 10, 2021
fc216c6
Merge remote-tracking branch 'origin/RenderImprovement' into RenderIm…
taooceros Jan 10, 2021
3892b59
Remove extra null check (use string.iswhitespaceornull)
taooceros Jan 13, 2021
575ad91
Merge dev
taooceros Jan 13, 2021
c39dfab
fix priority scoring
taooceros Jan 13, 2021
3d69998
fix potential duplicate item due to IResultUpdate event
taooceros Jan 14, 2021
1cbe1a9
Merge remote-tracking branch 'upstream/dev' into RenderImprovement
taooceros Jan 17, 2021
3abc77f
Merge remote-tracking branch 'upstream/dev' into RenderImprovement
taooceros Jan 17, 2021
1071f75
Remove unused using
taooceros Jan 17, 2021
5011246
Add scoring to ContextMenu search
taooceros Jan 17, 2021
e2e3f4a
remove extra query building due to merge
taooceros Jan 17, 2021
89443ba
fix formatting
jjw24 Jan 19, 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
3 changes: 1 addition & 2 deletions Flow.Launcher.Infrastructure/Image/ImageCache.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ public ImageSource this[string path]

public bool ContainsKey(string key)
{
var contains = Data.ContainsKey(key) && Data[key] != null;
return contains;
return Data.ContainsKey(key) && Data[key].imageSource != null;
}

public int CacheSize()
Expand Down
6 changes: 5 additions & 1 deletion Flow.Launcher.Infrastructure/Logger/Log.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,18 @@ private static bool FormatValid(string message)
return valid;
}



[MethodImpl(MethodImplOptions.Synchronized)]
public static void Exception(string className, string message, System.Exception exception, [CallerMemberName] string methodName = "")
{
#if DEBUG
throw exception;
#else
var classNameWithMethod = CheckClassAndMessageAndReturnFullClassWithMethod(className, message, methodName);

ExceptionInternal(classNameWithMethod, message, exception);
#endif
}

private static string CheckClassAndMessageAndReturnFullClassWithMethod(string className, string message,
Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher/ResultListBox.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
d:DataContext="{d:DesignInstance vm:ResultsViewModel}"
MaxHeight="{Binding MaxHeight}"
SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
SelectedItem="{Binding SelectedItem, Mode=OneWayToSource}"
SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
HorizontalContentAlignment="Stretch" ItemsSource="{Binding Results}"
Margin="{Binding Margin}"
Visibility="{Binding Visbility}"
Expand Down
Loading