-
Notifications
You must be signed in to change notification settings - Fork 42
Bugfix/issue 82 tray menu overflow #83
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
Open
NichUK
wants to merge
4
commits into
openclaw:master
Choose a base branch
from
NichUK:bugfix/issue-82-tray-menu-overflow
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+181
−5
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
df19165
Add regression test for #82 tray menu overflow
NichUK 38322b9
Fix #82 constrain tray menu height to work area
NichUK e158e4b
Fix #82 clamp tray menu height correctly on high-DPI displays
NichUK 47e08eb
fix: address Copilot tray menu review comments
NichUK 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| namespace OpenClaw.Shared; | ||
|
|
||
| /// <summary> | ||
| /// Pure helper methods for constraining popup menu size to the visible work area. | ||
| /// </summary> | ||
| public static class MenuSizingHelper | ||
| { | ||
| public static int ConvertPixelsToViewUnits(int pixels, uint dpi) | ||
| { | ||
| if (pixels <= 0) return 0; | ||
| if (dpi == 0) dpi = 96; | ||
|
|
||
| return Math.Max(1, (int)Math.Floor(pixels * 96.0 / dpi)); | ||
| } | ||
|
|
||
| public static int CalculateWindowHeight(int contentHeight, int workAreaHeight, int minimumHeight = 100) | ||
| { | ||
| if (contentHeight < 0) contentHeight = 0; | ||
| if (minimumHeight < 1) minimumHeight = 1; | ||
|
|
||
| if (workAreaHeight <= 0) | ||
| return Math.Max(contentHeight, minimumHeight); | ||
|
|
||
| var minimumVisibleHeight = Math.Min(minimumHeight, workAreaHeight); | ||
| var desiredHeight = Math.Max(contentHeight, minimumVisibleHeight); | ||
| return Math.Min(desiredHeight, workAreaHeight); | ||
| } | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| using System.Text.RegularExpressions; | ||
|
|
||
| namespace OpenClaw.Tray.Tests; | ||
|
|
||
| public class TrayMenuWindowMarkupTests | ||
| { | ||
| [Fact] | ||
| public void TrayMenuWindow_UsesVisibleVerticalScrollbar() | ||
| { | ||
| var xamlPath = Path.Combine( | ||
| GetRepositoryRoot(), | ||
| "src", | ||
| "OpenClaw.Tray.WinUI", | ||
| "Windows", | ||
| "TrayMenuWindow.xaml"); | ||
|
|
||
| var xaml = File.ReadAllText(xamlPath); | ||
|
|
||
| Assert.Matches( | ||
| new Regex(@"<ScrollViewer[^>]*VerticalScrollBarVisibility=""Visible""", RegexOptions.Singleline), | ||
| xaml); | ||
| } | ||
|
|
||
| private static string GetRepositoryRoot() | ||
| { | ||
| var directory = new DirectoryInfo(AppContext.BaseDirectory); | ||
| while (directory != null) | ||
| { | ||
| if (File.Exists(Path.Combine(directory.FullName, "moltbot-windows-hub.slnx")) && | ||
| Directory.Exists(Path.Combine(directory.FullName, "src"))) | ||
| { | ||
| return directory.FullName; | ||
| } | ||
|
|
||
| directory = directory.Parent; | ||
| } | ||
|
|
||
| throw new InvalidOperationException("Could not find repository root."); | ||
| } | ||
| } |
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.