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

[v3 alpha] implement setIcon on linux #3354

Merged
merged 2 commits into from
Apr 9, 2024

Conversation

abichinger
Copy link

Description

This PR loads and displays application.Options.Icon on linux.

Type of change

  • New feature (non-breaking change which adds functionality)

How Has This Been Tested?

I have embedded a custom icon in a test project.

  • Windows
  • macOS
  • Linux

Test Configuration

# Build Environment
Wails CLI    | v3.0.0-alpha.4
                          
Go Version   | go1.22.0                                
Revision     | 238b9ede787b693705fc0a9a8f36da50ac44f6b2
Modified     | true                                    
-buildmode   | exe                                     
-compiler    | gc                                      
CGO_CFLAGS   |                                         
CGO_CPPFLAGS |                                         
CGO_CXXFLAGS |                                         
CGO_ENABLED  | 1                                       
CGO_LDFLAGS  |                                         
GOAMD64      | v1                                      
GOARCH       | amd64                                   
GOOS         | linux                                   
vcs          | git                                     
vcs.modified | true                                    
vcs.revision | 238b9ede787b693705fc0a9a8f36da50ac44f6b2
vcs.time     | 2024-03-26T10:11:35Z                    

# System
Name         | Manjaro Linux                                                                                                 
Version      | Unknown                                                                                                       
ID           | manjaro                                                                                                       
Branding     |                                                                                                               
Platform     | linux                                                                                                         
Architecture | amd64                                                                                                         
gcc          | 13.2.1-5                                                                                                      
libgtk-3     | 1:3.24.41-1                                                                                                   
libwebkit    | 2.42.5-2                                                                                                      
npm          | 10.5.0-1                                                                                                      
pkg-config   | 2.1.0-2                                                                                                       
CPU          | AMD Ryzen 5 3600 6-Core Processor                                                                             
GPU 1        | Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT] (Advanced Micro Devices, Inc. [AMD/ATI]) - Driver: amdgpu 
Memory       | 32GB                                                                                                          

# Diagnosis
 SUCCESS  Your system is ready for Wails development!

Checklist:

  • I have updated website/src/pages/changelog.mdx with details of this PR
  • My code follows the general coding style of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

Copy link
Contributor

coderabbitai bot commented Mar 29, 2024

Important

Auto Review Skipped

Auto reviews are disabled on base/target branches other than the default branch. Please add the base/target branch pattern to the list of additional branches to be reviewed in the settings.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository.

To trigger a single review, invoke the @coderabbitai review command.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

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>.
    • 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 generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @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.

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 as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration 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.

@leaanthony
Copy link
Member

Thanks for doing this. Will test this week 👍

@tmclane
Copy link
Member

tmclane commented Apr 3, 2024

I would request that you place this code in the cgo specific file linux_cgo.go file. The intent behind doing that is that it will make it easier to use purego as well as an alternate implementation.

@tmclane
Copy link
Member

tmclane commented Apr 4, 2024

Thank you for implementing it! Appreciate the work!

I'll test it in a little while hopefully.

@@ -1131,6 +1145,12 @@ func (w *linuxWebviewWindow) setTitle(title string) {
}
}

func (w *linuxWebviewWindow) setIcon(icon pointer) {
if icon != nil {
C.gtk_window_set_icon(w.gtkWindow(), (*C.GdkPixbuf)(icon))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is setting a nil icon the method to remove the icon? Presumably

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is checked for nil, because there could go something wrong while loading the icon at linuxApp.setIcon. e.g. someone could set application.Options.Icon to an invalid image format

@tmclane
Copy link
Member

tmclane commented Apr 9, 2024

My Manjaro does not show Icons it seems even with this change. Which desktop environment are you using? gnome?

@tmclane
Copy link
Member

tmclane commented Apr 9, 2024

Actually I do see it now. Turns out I just wasn't able to override it in the code. Only shows up in the application overview where you can see all open windows.

@tmclane tmclane merged commit 7c921d6 into wailsapp:v3-alpha Apr 9, 2024
4 checks passed
@abichinger
Copy link
Author

abichinger commented Apr 9, 2024

Which desktop environment are you using? gnome?

I'm using Xfce

@leaanthony
Copy link
Member

Thanks @abichinger 🙏 Please could you retrospectively add an entry to the changelog located at mkdocs-website/docs/changelog.md? Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants