-
Notifications
You must be signed in to change notification settings - Fork 6.7k
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
[PTRun]Bring back acrylic and proper fix to title bar accent showing #33458
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
09f909d
Revert "[PTRun]Fix accent on title bar bleed into UI (#33046)"
jaimecbernardo 1262596
Revert "[PTRun]Use Mica backdrop to fix crashes with WPFUI (#32118)"
jaimecbernardo b24ded4
Fix DWMAttributes in Wox Plugin Native Methods
jaimecbernardo 661be8d
Fix titlebar accent showing
jaimecbernardo 36e152d
Fix number on wrong enum
jaimecbernardo 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 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 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 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 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 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 |
---|---|---|
|
@@ -66,7 +66,7 @@ public static class NativeMethods | |
public static extern int DwmpActivateLivePreview([MarshalAs(UnmanagedType.Bool)] bool fActivate, IntPtr hWndExclude, IntPtr hWndInsertBefore, LivePreviewTrigger lpt, IntPtr prcFinalRect); | ||
|
||
[DllImport("dwmapi.dll", PreserveSig = false)] | ||
public static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int attrValue, int attrSize); | ||
public static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref uint attrValue, int attrSize); | ||
|
||
[DllImport("dwmapi.dll", PreserveSig = false)] | ||
public static extern int DwmGetWindowAttribute(IntPtr hwnd, int dwAttribute, out int pvAttribute, int cbAttribute); | ||
|
@@ -493,29 +493,29 @@ public enum DwmNCRenderingPolicies | |
public enum DwmWindowAttributes | ||
{ | ||
NCRenderingEnabled = 1, | ||
NCRenderingPolicy, | ||
TransitionsForceDisabled, | ||
AllowNCPaint, | ||
CaptionButtonBounds, | ||
NonClientRtlLayout, | ||
ForceIconicRepresentation, | ||
Flip3DPolicy, | ||
ExtendedFrameBounds, | ||
HasIconicBitmap, | ||
DisallowPeek, | ||
ExcludedFromPeek, | ||
Cloak, | ||
Cloaked, | ||
FreezeRepresentation, | ||
PassiveUpdateMode, | ||
UseHostbackdropbrush, | ||
UseImmersiveDarkMode, | ||
WindowCornerPreference, | ||
BorderColor, | ||
CaptionColor, | ||
TextColor, | ||
NCRenderingPolicy = 2, | ||
TransitionsForceDisabled = 3, | ||
AllowNCPaint = 4, | ||
CaptionButtonBounds = 5, | ||
NonClientRtlLayout = 6, | ||
ForceIconicRepresentation = 7, | ||
Flip3DPolicy = 8, | ||
ExtendedFrameBounds = 9, | ||
HasIconicBitmap = 10, | ||
DisallowPeek = 11, | ||
ExcludedFromPeek = 12, | ||
Cloak = 13, | ||
Cloaked = 14, | ||
FreezeRepresentation = 15, | ||
PassiveUpdateMode = 16, | ||
UseHostbackdropbrush = 17, | ||
UseImmersiveDarkMode = 20, | ||
WindowCornerPreference = 33, | ||
BorderColor = 34, | ||
CaptionColor = 35, | ||
TextColor = 36, | ||
VisibleFrameBorderThickness, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. number is missing. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You're right! Thank you! Fixed! |
||
Last, | ||
Last = 37, | ||
} | ||
|
||
/// <summary> | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we use a different enum in ww plugin? otherwise please verify that no dummy windows for uwp apps shown in results.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ww plugin just puts 12 directly 😆
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For the cloak ones, the number is the same :) It starts with 1 and goes up is the default behavior, so the number will be kept.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was trying to use CaptionColor and that's when I saw this was wrong.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No. See
Components\Window.cs:L306
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know :) Cloak and Cloaked get the same value due to the default +1 logic in enums. This just makes it explicit since not every value follows that logic
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My mistake. Thought the counter changes
+1
for the first enum item. But the first two have a very similar name. 🙃