Skip to content
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

Force FL window foreground when switching keyboard layout #3375

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

Conversation

Jack251970
Copy link
Contributor

@Jack251970 Jack251970 commented Mar 24, 2025

Follow on with #3366.

When switching keyboard layout, we need to make sure foreground window is FL main window.

@Jack251970 Jack251970 added the Dev branch only An issue or fix for the Dev branch build label Mar 24, 2025
@Jack251970 Jack251970 added this to the 1.20.0 milestone Mar 24, 2025
@Jack251970 Jack251970 requested a review from Yusyuriv March 24, 2025 00:52
@Jack251970 Jack251970 enabled auto-merge March 24, 2025 00:52
Copy link

@check-spelling-bot Report

🔴 Please review

See the 📂 files view, the 📜action log, or 📝 job summary for details.

❌ Errors Count
❌ forbidden-pattern 22
⚠️ ignored-expect-variant 1
⚠️ non-alpha-in-dictionary 19

See ❌ Event descriptions for more information.

If the flagged items are 🤯 false positives

If items relate to a ...

  • binary file (or some other file you wouldn't want to check at all).

    Please add a file path to the excludes.txt file matching the containing file.

    File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

    ^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

  • well-formed pattern.

    If you can write a pattern that would match it,
    try adding it to the patterns.txt file.

    Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

    Note that patterns can't match multiline strings.

Copy link

gitstream-cm bot commented Mar 24, 2025

🥷 Code experts: no user but you matched threshold 10

Jack251970 has most 👩‍💻 activity in the files.
Jack251970 has most 🧠 knowledge in the files.

See details

Flow.Launcher.Infrastructure/Win32Helper.cs

Activity based on git-commit:

Jack251970
MAR 555 additions & 218 deletions
FEB 13 additions & 16 deletions
JAN 0 additions & 138 deletions
DEC 243 additions & 4 deletions
NOV
OCT

Knowledge based on git-blame:
Jack251970: 92%

To learn more about /:\ gitStream - Visit our Docs

Copy link

gitstream-cm bot commented Mar 24, 2025

Be a legend 🏆 by adding a before and after screenshot of the changes you made, especially if they are around UI/UX.

Copy link
Contributor

coderabbitai bot commented Mar 24, 2025

📝 Walkthrough

Walkthrough

The changes update the Win32Helper class by adding two methods to check if a specified window or handle is the foreground window. The SwitchToEnglishKeyboardLayout method now retrieves the main window handle and verifies if it is in the foreground, setting it if necessary via a call to PInvoke.SetForegroundWindow. Additionally, a loop's variable name is updated in the language tag comparison for clarity and simplified logic.

Changes

File Change Summary
Flow.Launcher.Infrastructure/Win32Helper.cs • Added two methods: IsForegroundWindow(Window window) (public) and IsForegroundWindow(HWND handle) (internal).
• Modified SwitchToEnglishKeyboardLayout to obtain the main window handle via GetWindowHandle and include a foreground check with PInvoke.SetForegroundWindow, throwing a Win32Exception on failure.
• Renamed loop variable from langTag to imeLangTag and simplified the language tag comparison logic.

Sequence Diagram(s)

sequenceDiagram
    participant App as Application
    participant Helper as Win32Helper
    participant PInvoke as PInvoke

    App->>Helper: Call SwitchToEnglishKeyboardLayout()
    Helper->>Helper: Retrieve main window handle via GetWindowHandle()
    Helper->>Helper: Check if handle is the foreground window (IsForegroundWindow)
    alt Window is not foreground
        Helper->>PInvoke: Invoke SetForegroundWindow(hwnd)
        PInvoke-->>Helper: Return status
        alt Operation fails
            Helper-->>App: Throw Win32Exception
        else Operation succeeds
            Helper-->>App: Continue execution
        end
    else Window is already foreground
        Helper-->>App: Continue execution
    end
Loading

Possibly related PRs

Suggested labels

enhancement, kind/ui

Suggested reviewers

  • jjw24
  • onesounds
  • taooceros

Poem

In a burrow of code so deep,
I hopped and added methods to keep.
A window check to bring light,
Ensuring the foreground is set right.
With each line I dance with glee, 🐇
Celebrating the changes merrily!


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between ddec1bd and d66bdbb.

📒 Files selected for processing (1)
  • Flow.Launcher.Infrastructure/Win32Helper.cs (3 hunks)
🧰 Additional context used
🧬 Code Definitions (1)
Flow.Launcher.Infrastructure/Win32Helper.cs (2)
Flow.Launcher.Infrastructure/PInvokeExtensions.cs (1)
  • PInvoke (8-25)
Flow.Launcher/MainWindow.xaml.cs (2)
  • MainWindow (30-998)
  • MainWindow (65-77)
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: gitStream.cm
  • GitHub Check: gitStream.cm
  • GitHub Check: gitStream.cm
🔇 Additional comments (5)
Flow.Launcher.Infrastructure/Win32Helper.cs (5)

127-130: Good addition of a window foreground check method.

This new method provides a clean way to check if a specific window is currently in the foreground, which improves code readability and maintainability throughout the codebase.


132-135: Well-implemented internal helper method.

This internal method provides the same functionality for HWND handles directly, which is a good separation of concerns and helps avoid duplication in the implementation.


367-369: Good modification to use the application's main window.

Instead of using the current foreground window, you're now explicitly retrieving the main window handle, which is more precise and aligns better with the intention of switching the keyboard layout for Flow Launcher's main window.


371-376: Excellent enhancement that ensures keyboard layout switching works correctly.

This change ensures that Flow Launcher's window is in the foreground before attempting to switch the keyboard layout, which addresses a potential issue where the layout might not switch correctly if another window is in focus. The exception handling is also appropriate for catching Win32 API failures.


387-391: Improved variable naming and logic in the IME language check.

The variable renaming from the generic langTag to the more specific imeLangTag improves code readability. Additionally, the comparison logic has been simplified, making it easier to understand that you're checking if the current language starts with any of the IME language tags.

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Dev branch only An issue or fix for the Dev branch build
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant