-
Notifications
You must be signed in to change notification settings - Fork 29
fix(icon-handling) - Disposing icon after ImageSource is created from its handle #617
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
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
c0d023a
fix(icon-handling) - Disposing icon after ImageSource is created from…
lilla28 7fc8cb5
fix(folder-structure) - Moved MorganStanley.ComposeUI.Testing under t…
lilla28 facc631
fix(icon-handling) - Add test for ToImageSource extension method to c…
lilla28 8dd46ec
Merge branch 'main' into icon-handling
lilla28 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
src/shared/dotnet/src/MorganStanley.ComposeUI.Utilities/NativeMethods.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
/* | ||
* Morgan Stanley makes this available to you under the Apache License, | ||
* Version 2.0 (the "License"). You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0. | ||
* | ||
* See the NOTICE file distributed with this work for additional information | ||
* regarding copyright ownership. Unless required by applicable law or agreed | ||
* to in writing, software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express | ||
* or implied. See the License for the specific language governing permissions | ||
* and limitations under the License. | ||
*/ | ||
|
||
using System.Runtime.InteropServices; | ||
using System; | ||
|
||
namespace MorganStanley.ComposeUI.Utilities; | ||
|
||
public static class NativeMethods | ||
{ | ||
[DllImport("gdi32.dll", SetLastError = true)] | ||
public static extern bool DeleteObject(in IntPtr hObject); | ||
} |
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,23 @@ | ||
using System; | ||
using System.Collections.Generic; | ||
using System.Linq; | ||
using System.Text; | ||
using System.Threading.Tasks; | ||
// /* | ||
// * Morgan Stanley makes this available to you under the Apache License, | ||
// * Version 2.0 (the "License"). You may obtain a copy of the License at | ||
// * | ||
// * http://www.apache.org/licenses/LICENSE-2.0. | ||
// * | ||
// * See the NOTICE file distributed with this work for additional information | ||
// * regarding copyright ownership. Unless required by applicable law or agreed | ||
// * to in writing, software distributed under the License is distributed on an | ||
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express | ||
// * or implied. See the License for the specific language governing permissions | ||
// * and limitations under the License. | ||
// */ | ||
|
||
namespace MorganStanley.ComposeUI.Shell.Utilities | ||
using System; | ||
|
||
namespace MorganStanley.ComposeUI.Shell.Utilities; | ||
|
||
internal class DiagnosticInfo | ||
{ | ||
internal class DiagnosticInfo | ||
{ | ||
public DateTime StartupTime { get; set; } | ||
public string ShellVersion { get; set; } | ||
} | ||
} | ||
public DateTime StartupTime { get; set; } | ||
public string ShellVersion { get; set; } | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
// /* | ||
// * Morgan Stanley makes this available to you under the Apache License, | ||
// * Version 2.0 (the "License"). You may obtain a copy of the License at | ||
// * | ||
// * http://www.apache.org/licenses/LICENSE-2.0. | ||
// * | ||
// * See the NOTICE file distributed with this work for additional information | ||
// * regarding copyright ownership. Unless required by applicable law or agreed | ||
// * to in writing, software distributed under the License is distributed on an | ||
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express | ||
// * or implied. See the License for the specific language governing permissions | ||
// * and limitations under the License. | ||
// */ | ||
|
||
using System.Drawing; | ||
using System.Drawing.Imaging; | ||
using System.IO; | ||
using System.Windows.Media.Imaging; | ||
using MorganStanley.ComposeUI.Utilities; | ||
|
||
namespace MorganStanley.ComposeUI.Shell.Utilities; | ||
public static class IconUtilities | ||
{ | ||
public static System.Windows.Media.ImageSource ToImageSource(this Bitmap bitmap) | ||
{ | ||
try | ||
{ | ||
using var memoryStream = new MemoryStream(); | ||
|
||
bitmap.Save(memoryStream, ImageFormat.Png); | ||
memoryStream.Position = 0; | ||
|
||
var bitmapImage = new BitmapImage(); | ||
|
||
bitmapImage.BeginInit(); | ||
bitmapImage.StreamSource = memoryStream; | ||
bitmapImage.CacheOption = BitmapCacheOption.OnLoad; | ||
bitmapImage.EndInit(); | ||
bitmapImage.Freeze(); | ||
|
||
return bitmapImage; | ||
} | ||
finally | ||
{ | ||
NativeMethods.DeleteObject(bitmap.GetHbitmap()); | ||
} | ||
} | ||
} | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.