Skip to content

Prevent leaking WPF textview #67

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

Open
ryanmolden wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prevent leaking WPF textview #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 19 additions & 3 deletions doki-theme-visualstudio/StickerAdornment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ internal sealed class StickerAdornment {

private const string TagName = "DokiSticker";

private readonly IWpfTextView _view;
private IWpfTextView _view;

private bool _registeredLayoutListener;

Expand All @@ -25,7 +25,7 @@ public StickerAdornment(IWpfTextView view) {
_adornmentLayer = view.GetAdornmentLayer("StickerAdornment");
RemoveAdornment();

ThemeManager.Instance.DokiThemeChanged += (_, themeChangedArgs) => {
EventHandler<ThemeChangedArgs> themeChangedCallback = (_, themeChangedArgs) => {
var newDokiTheme = themeChangedArgs.Theme;
if (newDokiTheme != null && SettingsService.Instance.DrawSticker) {
GetImageSource(newDokiTheme, newSource => {
Expand All @@ -38,7 +38,9 @@ public StickerAdornment(IWpfTextView view) {
}
};

SettingsService.Instance.SettingsChanged += (_, service) => {
ThemeManager.Instance.DokiThemeChanged += themeChangedCallback;

EventHandler<SettingsService> settingsChangedCallback = (_, service) => {
if (service.DrawSticker) {
DrawCurrentSticker();
DoStupidShit();
Expand All @@ -49,6 +51,20 @@ public StickerAdornment(IWpfTextView view) {
_stickerSize = service.StickerRelativeSize;
};

SettingsService.Instance.SettingsChanged += settingsChangedCallback;

EventHandler textviewClosed = null;
textviewClosed = (_, args) => {
// Clean up all our references as the textview has closed
ThemeManager.Instance.DokiThemeChanged -= themeChangedCallback;
SettingsService.Instance.SettingsChanged -= settingsChangedCallback;

_view.Closed -= textviewClosed;
_view = null;
};

_view.Closed += textviewClosed;

_stickerSize = SettingsService.Instance.StickerRelativeSize;

if (!SettingsService.Instance.DrawSticker) return;
Expand Down