Skip to content

Fix trayicon theme change #117

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Oct 5, 2024
Merged

Fix trayicon theme change #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5df379
fix: #19 call UpdateDefaultStyle for context menu and popup to make s…
punker76 Oct 5, 2024
85e202b
reafctor: improve inline popup sample
punker76 Oct 5, 2024
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
9 changes: 7 additions & 2 deletions src/NotifyIconWpf.Sample.ShowCases/Commands/CloseWindowCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

using System.Windows;
using System.Windows.Input;
using Hardcodet.Wpf.TaskbarNotification;

namespace NotifyIconWpf.Sample.ShowCases.Commands
{
Expand All @@ -15,8 +16,12 @@ public class CloseWindowCommand : CommandBase<CloseWindowCommand>
{
public override void Execute(object parameter)
{
GetTaskbarWindow(parameter).Close();
CommandManager.InvalidateRequerySuggested();
if (parameter is TaskbarIcon taskbarIcon)
{
taskbarIcon.CloseTrayPopup();
GetTaskbarWindow(taskbarIcon).Close();
CommandManager.InvalidateRequerySuggested();
}
}


Expand Down
3 changes: 1 addition & 2 deletions src/NotifyIconWpf.Sample.ShowCases/Tutorials/03 - Popups/InlinePopupWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
Background="White"
BorderBrush="Orange"
BorderThickness="2"
CornerRadius="4"
Width="160">
CornerRadius="4">
<StackPanel>
<TextBox
x:Name="popupText"
Expand Down
9 changes: 9 additions & 0 deletions src/NotifyIconWpf/TaskbarIcon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@ public void ShowCustomBalloon(UIElement balloon, PopupAnimation animation, int?
// fire attached event
RaiseBalloonShowingEvent(balloon, this);

// To apply DynamicResource changes (related to issue on GitHub for TaskbarIcon: https://github.com/hardcodet/wpf-notifyicon/issues/19)
popup.UpdateDefaultStyle();

// display item
popup.IsOpen = true;

Expand Down Expand Up @@ -676,6 +679,9 @@ public void ShowTrayPopup()
// place the popup
PlacePopup(PopupPlacement);

// To apply DynamicResource changes (related to issue on GitHub for TaskbarIcon: https://github.com/hardcodet/wpf-notifyicon/issues/19)
TrayPopupResolved.UpdateDefaultStyle();

// open popup
TrayPopupResolved.IsOpen = true;

Expand Down Expand Up @@ -747,6 +753,9 @@ private void ShowContextMenu(Point cursorPosition)
return;
}

// To apply DynamicResource changes (related to issue on GitHub for TaskbarIcon: https://github.com/hardcodet/wpf-notifyicon/issues/19)
ContextMenu.UpdateDefaultStyle();

// use absolute positioning. We need to set the coordinates, or a delayed opening
// (e.g. when left-clicked) opens the context menu at the wrong place if the mouse
// is moved!
Expand Down